Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 23:06:50 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 23:06:50 +0000 (16:06 -0700)
commit3aa3dfb372576f30835a94409556e3c8681b5756
treed54ad92c1680a332c6232d3d06315ccb51a74d32
parent19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1
parent5ab6091db0b644f59c2f16c5e41028496b709160
Merge master.kernel.org:/home/rmk/linux-2.6-arm