Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 29 Jan 2006 17:41:09 +0000 (12:41 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 29 Jan 2006 17:41:09 +0000 (12:41 -0500)
commitd6fb89bf6b8b45ec8c911570ba0852940690d846
tree38e7d7c8f2b5b6f0ae1dd6e977154bcb48389a62
parentb1d917739acd44e14eb13813e4c94dc4b6831ca3
parent9220a2d0daa1e6782f02d47303340d7b5ca62ac0
Merge branch 'upstream-fixes'
drivers/scsi/ahci.c