]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 2 Jul 2006 23:35:07 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 2 Jul 2006 23:35:07 +0000 (16:35 -0700)
* '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

1  2 
drivers/mmc/sdhci.c

Simple merge