Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 21:49:29 +0000 (14:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 21:49:29 +0000 (14:49 -0700)
commitc9ab09710ecb071031b0a04f3f9d7e686c0a75e0
tree4c270fb2390392d44426ab7551f0fa0215e1def4
parentff9144530e9cfe8923e00172e3f8ff83c3b8ff8b
parent12223dabc617a4babfba4e17feb1ed88e8cfeb8f
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Add (MMC) to entry in MAINTAINERS file
  [MMC] sdhci truncated pointer fix
MAINTAINERS