Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:58:22 +0000 (19:58 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:58:22 +0000 (19:58 -0500)
commit79072f38909e3d9883317238887460c39ddcc4cb
tree28369f5a844535ff836565eefd62695b0e890fa3
parent200d5a7684cc49ef4be40e832daf3f217e70dfbb
parent55d8ca4f8094246da6e71889a4e04bfafaa78b10
Merge branch 'upstream'
drivers/scsi/libata-scsi.c
include/linux/libata.h