Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:24:55 +0000 (17:24 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:24:55 +0000 (17:24 -0500)
commit74d89c16735d83349ea74232031819e989a49156
tree1d8ded9c76b6ebe97c3841bbb986aacd63a801e5
parent52a3220599647ba429fcbca2388ec35b850fa72f
parent05c8e0ac5c37e9739a852b526afeecae97607cbb
Merge branch 'upstream'
drivers/scsi/libata-core.c