commit | f82bc1762e0e74b7e0040a4d83be06d32c37fc2e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Sun Jul 02 16:35:07 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Sun Jul 02 16:35:07 2006 -0700 |
tree | 685e0c3b5a962928efb66e36d9185febddaf5964 | |
parent | 4ebd9ab387b39c44165cd296a6637082a4f0f66a [diff] | |
parent | 4cca56c50427eecfa2428cdee722848cd82f443c [diff] |
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