Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:06:50 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:06:50 +0000 (09:06 -0700)

Trivial merge