Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Feb 2006 23:21:22 +0000 (15:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Feb 2006 23:21:22 +0000 (15:21 -0800)
commit245599f573f302bfa27a0436408c80f13b457046
tree4683cf7b59ec75b0efd9a1aaf7fc1ecafcbd6f6c
parent6cec2aed8686840906f6298391dc4fd04d9ba843
parent5bd546aa78b5d74f3162815e41940f862215d9e3
Merge master.kernel.org:/home/rmk/linux-2.6-mmc