Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Mon, 27 Feb 2006 16:51:52 +0000 (11:51 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 27 Feb 2006 16:51:52 +0000 (11:51 -0500)
commit1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299
tree7f30dbdccd6c28aa4e8f2c9edb7813a7ae78097b
parent11fff8287fdaeb700df79aa8253650b60c7b21e2
parentcccc65a3b60edaf721cdee5a14f68ba009341822
Merge branch 'upstream'
drivers/scsi/libata-core.c