From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 2 Jul 2006 23:35:07 +0000 (-0700)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.18-rc1~142
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f82bc1762e0e74b7e0040a4d83be06d32c37fc2e;p=linux-2.6-omap-h63xx.git

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] sdhci: remove duplicate error message
  [MMC] sdhci: force DMA on some controllers
  [MMC] sdhci: quirk for broken reset
  [MMC] sdhci: Add SDHCI controller ids
---

f82bc1762e0e74b7e0040a4d83be06d32c37fc2e