Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:29:23 +0000 (08:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:29:23 +0000 (08:29 -0400)
commitcea0d336e7e139becc9432499e0ba8234ffbed5f
tree14c910c33c3eb79b35a5d3b5ecf7a299d0860b4c
parentc6fd280766a050b13360d7c2d59a3d6bd3a27d9a
parenta34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf
Merge branch 'upstream-fixes' into upstream
drivers/ata/libata-core.c