Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 20:17:56 +0000 (15:17 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 20:17:56 +0000 (15:17 -0500)
commit8e181c14f2baa5be9b7f7c3917b7d4ecf7529110
treeb99427b2639c70e33911e80c947c984b340a4ed9
parenteee6c32f5f114f9b9f2d94862f0dc0d3ff523864
parent852ee16a914fb3ada2f81e222677c04defc2f15f
Merge branch 'upstream'
drivers/scsi/libata-core.c