From: Linus Torvalds Date: Sun, 8 Mar 2009 17:22:22 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Tag: 2.1b_release~13868 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd6ec5f3acfe7e94469d83374b83ff183953fa45;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git Merge git://git./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 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 --- fd6ec5f3acfe7e94469d83374b83ff183953fa45