]> git.neil.brown.name Git - history.git/commitdiff
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.10
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Dec 2004 07:18:02 +0000 (23:18 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Dec 2004 07:18:02 +0000 (23:18 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge