From: Tejun Heo <htejun@gmail.com>
Date: Mon, 15 May 2006 11:59:15 +0000 (+0900)
Subject: Merge branch 'irq-pio'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12436c30f4808e00fa008c6787c609bc6ae216ba;p=pandora-kernel.git

Merge branch 'irq-pio'

Conflicts:

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

12436c30f4808e00fa008c6787c609bc6ae216ba
Reading git-diff-tree failed