]> err.no Git - linux-2.6/commit
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:33:54 +0000 (23:33 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:33:54 +0000 (23:33 -0500)
commitc4811b151b6584a668de8ae59eb71c4890b9ad94
tree152e0efddcfd882123757bbe36ae18249a9a9379
parent024b1432716c0d8332327a506cb0f64c9a2f6083
parent005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a
Merge branch 'upstream'
drivers/scsi/libata-scsi.c