From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 5 Jun 2006 23:22:43 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.17-rc6~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2f9c3c2c24af5f2e6061756d6fc04fdf66f41106;p=linux-2.6-omap-h63xx.git

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
---

2f9c3c2c24af5f2e6061756d6fc04fdf66f41106