summaryrefslogtreecommitdiffstats
path: root/drivers/block/ataflop.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-11 12:26:03 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-11 12:26:03 -0800
commit69de7fc037c8cda6fd20a632d39461bf9d42b927 (patch)
tree096e704e8f97079ec5c1edd9d1d99b01cddc920e /drivers/block/ataflop.c
parent116140b7f5c9182c86a4e419f81684209357aea7 (diff)
parent99eeb8dfb1ce3df744e2e0d00dd627d7a8199ef0 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: AT91 MMC update for 2.6.19 mmc: Change SDHCI iomem error to a warning mmc: fix "prev->state: 2 != TASK_RUNNING??" problem on SD/MMC card removal AT91 MMC 5 : Minor cleanups AT91 MMC 4 : Interrupt handler cleanup AT91 MMC 3 : Move global mci_clk variable AT91 MMC 2 : Use platform resources AT91 MMC 1: Pass host structure.
Diffstat (limited to 'drivers/block/ataflop.c')
0 files changed, 0 insertions, 0 deletions