Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 15:34:07 +0000 (07:34 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 15:34:07 +0000 (07:34 -0800)
commitc1d962035d49565d8c7a2d97519012ccb861778a
treec958743946f813ebda2e8fd17c54455fd6f962af
parent4fd5f8267dd37aaebadfabe71d9c808821eea05a
parent005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev