diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 18:22:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 18:22:22 +0100 |
commit | fd6ec5f3acfe7e94469d83374b83ff183953fa45 (patch) | |
tree | 6f7aa80a8e95c054424d9e8229da3df0dd694ecd /drivers/dma/iop-adma.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | ata: add CFA specific identify data words (diff) | |
download | linux-fd6ec5f3acfe7e94469d83374b83ff183953fa45.tar.xz linux-fd6ec5f3acfe7e94469d83374b83ff183953fa45.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ata: add CFA specific identify data words
remove stale comment from <linux/hdreg.h>
AT91: initialize Compact Flash on AT91SAM9263 cpu
ide: add at91_ide driver
ide: allow to wrap interrupt handler
ide-iops: fix odd-length ATAPI PIO transfers
ide: NULL noise: drivers/ide/ide-*.c
ide: expiry() returns int, negative expiry() return values won't be noticed
Diffstat (limited to 'drivers/dma/iop-adma.c')
0 files changed, 0 insertions, 0 deletions