Merge branch 'master' into upstream-fixes
commit4ad99f15c6a3cadf36928c399459ea4fdb3d49f9
authorJeff Garzik <jeff@garzik.org>
Fri, 6 Oct 2006 01:03:43 +0000 (5 21:03 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 6 Oct 2006 01:03:43 +0000 (5 21:03 -0400)
treed0536e4da737900fa27b235f175a3d179d692200
parent46767aeba58ca9357a2309765201bad38d8f5e9b
parent44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3
Merge branch 'master' into upstream-fixes
drivers/ata/libata-core.c