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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge