Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:42:40 +0000 (11:42 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:42:40 +0000 (11:42 -0500)
commit85a07029aaba8f5b27241bcff56cc009c9f4993b
treec579554c2ea9c942ccbea60e223bc62d8262f652
parent0da36b3467040908d3df6bc1f5b4d592a8b23b63
parent79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb
Merge branch 'upstream'
drivers/scsi/libata-scsi.c