Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 03:26:11 +0000 (20:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 03:26:11 +0000 (20:26 -0700)

Trivial merge