Merge branch 'upstream' into pata-drivers
authorJeff Garzik <jeff@garzik.org>
Thu, 31 Aug 2006 04:02:26 +0000 (00:02 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 31 Aug 2006 04:02:26 +0000 (00:02 -0400)
commit481ff126e8d9be63809e7854badf815e54066eed
treec682ce7a20bf129428fc0f3cc393f9c9b39ed678
parent669a5db411d85a14f86cd92bc16bf7ab5b8aa235
parent9bec2e38527a9f2497b3d976715c672d08d6160d
Merge branch 'upstream' into pata-drivers
include/linux/libata.h