]> err.no Git - linux-2.6/commit
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 09:46:16 +0000 (04:46 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 09:46:16 +0000 (04:46 -0500)
commitd2927cbe40b29ceda96c7a2412f7daee70026aad
tree06d3692cb40ed7c787b8860ae926d4bda43d59ef
parent9359ede748ff1461bf0632fb4182f61da4a2f9e2
parenta7dac447bb9cef27d4d29cdf63e2d7809c50b1f4
Merge branch 'upstream'
drivers/scsi/libata-scsi.c