Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Sep 2005 17:31:31 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Sep 2005 17:31:31 +0000 (10:31 -0700)
commit6da34a8dc03c9605b03154eacfd2234627cc485a
tree7a188419be39f97442ec2c611cda48c3f3774052
parent53abbf7eeab22620586cbba272e569fd3e729b0b
parent7fb6ec287a05d7a71ec086d8bc9a452d5e16ff1a
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev