]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 17 Jan 2006 15:26:28 +0000 (10:26 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 17 Jan 2006 15:26:28 +0000 (10:26 -0500)
commit0825788ff27c7145e9d558cb2a26f3837d1f9be5
treef6bdb892cec8ca0df69c08a3477c89f1542999e5
parent02f693c7118f6be9e677070eb630c1f3a654cdd3
parent1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9
Merge branch 'upstream'
drivers/scsi/libata-scsi.c
include/linux/ata.h