Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:23:11 +0000 (21:23 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:23:11 +0000 (21:23 -0400)
commit4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283
treea802614e01460631c694dfa118642d54c3d5fc79
parente33b9dfa3008fcaa908dc0c8c472a812c400f839
parent59a10b172fccaea793352c00fd9065f0a5b4ef70
Merge branch 'upstream'
drivers/scsi/libata-core.c
include/linux/ata.h
include/linux/libata.h