Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 5 Jun 2006 23:22:43 +0000 (16:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 5 Jun 2006 23:22:43 +0000 (16:22 -0700)
commit2f9c3c2c24af5f2e6061756d6fc04fdf66f41106
tree692c71cf8e5fbc5d9fa29b56e1b08d9ea124ddda
parent1b41526975d8318ca17c93f724893884d03a0560
parent092d01e260da628b01d4229c31a296111e3cd97a
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Prevent au1xmmc.c breakage on non-Au1200 Alchemy
  [MMC] Add maintainers entry for MMC subsystem
MAINTAINERS