Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
commit875999c5539999f61a45620aae0c3e5fb1d2b035
tree4535032a8a10f5782c0aef6a620b1a624ea9f863
parent79072f38909e3d9883317238887460c39ddcc4cb
parent26ec634c31a11a003040e10b4d650495158632fd
Merge branch 'upstream'
drivers/scsi/libata-scsi.c
include/linux/libata.h