Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 18:26:04 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 18:26:04 +0000 (11:26 -0700)
commit955c5038823748e529a49f0e33ab635d92843500
tree371d937281474e6abf09b9a893966c85c5e9ad70
parent62d3af1b5f3aa613e0a489e8d798d45b07f373f4
parent2ab540becd1bcf9c6886370fd8c67e56dd1c9f3a
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev