Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 06:35:03 +0000 (01:35 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 06:35:03 +0000 (01:35 -0500)
commitfb2a26b9f8f5eda6b96ba9753edf105e5999d6d9
tree9019fb641794f0a3962d45621e6e5ffb0a8acaf6
parent07f6f7d074e68d56d82e7cc5c65096033ac8dc56
parent7c3983357fdaef3ae71a0d7081a4b6dcfd869d39
Merge branch 'upstream'
drivers/scsi/libata-core.c