Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:45:22 +0000 (10:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:45:22 +0000 (10:45 -0800)
commit8995b161eb142b843094dd614b80e4cce1d66352
treeffd9988879441d5ec45ab96b2e06f4fcb1210158
parentcc918c7ab7da017bfaf9661420bb5c462e057cfb
parentfe5dd7c73d328b255286b6b65ca19dd34447f709
Merge master.kernel.org:/home/rmk/linux-2.6-arm
drivers/mmc/mmci.c