diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 14:52:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 14:52:27 -0700 |
commit | 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 (patch) | |
tree | e7e9dabd9d5bcf547946b3ae68e64ea68525e9d0 /include/asm-v850/v850e_timer_d.h | |
parent | cbdf811c77cf2906a099b8da92e9f6f335b68a73 (diff) | |
parent | 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 (diff) | |
download | blackbird-op-linux-6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8.tar.gz blackbird-op-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 'include/asm-v850/v850e_timer_d.h')
0 files changed, 0 insertions, 0 deletions