Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 19 Sep 2006 04:42:13 +0000 (00:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 19 Sep 2006 04:42:13 +0000 (00:42 -0400)
commit4a3381feb823e06c8e2da7e283c17b0b6fdbddcf
treee1bef4c3db854bb10fd13dc67415d77b5d999533
parentfea63e38013ec628ab3f7fddc4c2148064b7910a
parent47a5c6fa0e204a2b63309c648bb2fde36836c826
Merge branch 'master' into upstream
drivers/ata/libata-core.c