]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 15:38:12 +0000 (11:38 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 15:38:12 +0000 (11:38 -0400)
commita808be8a12d61cdacba350fdce2e448045be8202
treeb08dda3fb0dee06724320a5b0079fbc51c09c35b
parentc13b56a1130bbfacfb588de100e5a248383805a6
parent6d5f9732a16a74d75f8cdba5b00557662e83f466
Merge branch 'upstream'
drivers/scsi/libata-core.c