From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 14 Dec 2005 03:28:19 +0000 (-0500)
Subject: [libata sata_promise] irq_pio: fix merge bug
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~66
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d0a59c02303df01848537b3bf938dc11e9a0ded;p=pandora-kernel.git

[libata sata_promise] irq_pio: fix merge bug
---

Reading git-diff-tree failed