Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:35:48 +0000 (17:35 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:35:48 +0000 (17:35 -0400)
commit36a2c6b28003dd0592b8ece5e9409991e0820f50
treec5b52547b2658a8a3b898b8224b835a7e8396017
parent95916edd02e3a7752315422f386c55723d4a3637
parentf1d39b291e2263f5e2f2ec5d4061802f76d8ae67
Merge branch 'upstream-fixes' into upstream
drivers/scsi/ahci.c