Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Fri, 3 Mar 2006 17:16:03 +0000 (12:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 3 Mar 2006 17:16:03 +0000 (12:16 -0500)
commit801c63c38ae52e8bfb3f6518de00a0be22c55f9a
treebb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d
parent1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299
parent348edc59a8f9b9a66700781d972c24a46a79ae86
Merge branch 'upstream'
drivers/scsi/libata-core.c