Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 Aug 2005 18:56:19 +0000 (11:56 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 Aug 2005 18:56:19 +0000 (11:56 -0700)
commit0893dd327ffacb83dcca9033d2891d57b4024d6b
treedc7f614efa213e5939b32ef71209d832b28256fc
parent606867443764edac5a2c542f2fa0a12ef7a7c7fd
parent42517438f9c1011a03e49a542cba32ac5a80dd8e
Merge head 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev