Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 03:47:31 +0000 (19:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 03:47:31 +0000 (19:47 -0800)
commit728c7763e7234cf8d34fa159660df736556563c9
treefe66af9029dd1aea787d2a231a82dcaf5dc4c9ee
parentd1138cf035ad5a8dc0796b213bd078a2fb92eb7c
parenta1bd9e68573239320d18823c73eb06d8e56cc9e2
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev