Merge branch 'irq-pio'
authorTejun Heo <htejun@gmail.com>
Mon, 15 May 2006 11:59:15 +0000 (20:59 +0900)
committerTejun Heo <htejun@gmail.com>
Mon, 15 May 2006 11:59:15 +0000 (20:59 +0900)
Conflicts:

drivers/scsi/libata-core.c
include/linux/libata.h


Trivial merge