Merge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 23:44:52 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 23:44:52 +0000 (16:44 -0700)
commit87e807b6c461bbd449496a4c3ab78ab164a4ba97
tree6f5af52317ace30c1229e356a332093981763e39
parent2ead1aa6f14ed542af0c9e2302a51ea02128f587
parent536f8098026bde1368bbfcbcb9682a7637b73df2
Merge branch 'upstream' from /linux/kernel/git/jgarzik/libata-dev