Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:27:28 +0000 (10:27 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:27:28 +0000 (10:27 -0800)
commitbc781aa93e6dfa85aa251c8898f831031db55c49
treea5e258c39e3013b24b1a6bb4d399159c11bfe020
parent77f234f9d995c9b576b311a56f66db6837e598df
parentd2b18394259ef621fd2a6322aa9934198fd87a6a
Merge master.kernel.org:/home/rmk/linux-2.6-mmc