Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 05:19:18 +0000 (01:19 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 05:19:18 +0000 (01:19 -0400)
commit3f066887595de490c411762ce58a31412b09e939
treea26e04a120ae71ae72910cbd85c52ceba40a3ffc
parentf4b5cc874158a139c091b3decd468929e10645e6
parent22aac0896b1b0b8cabaf00714c55dd12f25d5738
Merge branch 'upstream-fixes' into upstream
drivers/scsi/libata-scsi.c