Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
commit89ec9a1d93ab33c692d6adb0f1bcff4b2e98a10c
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 9 Oct 2004 08:36:36 +0000 (9 01:36 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 9 Oct 2004 08:36:36 +0000 (9 01:36 -0700)
tree85ca8f4a2ba75c7ecc1d29da9588887cdbcc9c22
parent47fcd4f08ab4e74359893c90c5766cbfec9a233f
parent433a3e8e9bc3bea33729ba38c4dd412f9ae80f0d
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux