tree 22ddaad8def4f4a77637a3da62a8d8f422a95c29
parent 88ce7550c38f46c8697f53727a571bf838bee398
parent 7894eaf291238a62a565e9e9777483beeb00eeae
author Tejun Heo <htejun@gmail.com> 1147694355 +0900
committer Tejun Heo <htejun@gmail.com> 1147694355 +0900

Merge branch 'irq-pio'

Conflicts:

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