summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 23:52:27 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 23:52:27 +0200
commit6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 (patch)
treee7e9dabd9d5bcf547946b3ae68e64ea68525e9d0 /arch
parentMerge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block (diff)
parent[MMC] Move set_ios debugging into mmc.c (diff)
downloadlinux-6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8.tar.xz
linux-6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8.zip
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Move set_ios debugging into mmc.c [MMC] Correct mmc_request_done comments [MMC] PXA: reduce the number of lines PXAMCI debug uses [MMC] PXA and i.MX: don't avoid sending stop command on error [MMC] extend data timeout for writes [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions