Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author <jgarzik@pretzel.yyz.us> <>
Thu, 26 May 2005 05:47:10 +0000 (01:47 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 26 May 2005 05:47:10 +0000 (01:47 -0400)
commit949d33e70f2c3e93bfe5265a50e40175b1ab1ec1
treeca88fd8f8f81b167dc4685ed34e9636f267db60d
parentb095518ef51c37658c58367bd19240b8a113f25c
parentbef9c558841604116704e10b3d9ff3dbf4939423
Merge ... /linux/kernel/git/torvalds/linux-2.6.git branch HEAD
drivers/scsi/libata-scsi.c