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)
commit5f5024130287a9467a41b9f94ec170958ae45cbd
tree930c901fe2e2438ce144453a5401243f0d70c30f
parent82b7ec75df5b52d6febffb02ce4080a67550ac56
parent8add788574694c5aed04fcb281a5c999e40cd8f6
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev