Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
author <jgarzik@pretzel.yyz.us> <>
Tue, 17 May 2005 15:30:39 +0000 (11:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 17 May 2005 15:30:39 +0000 (11:30 -0400)

Trivial merge