Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 17:39:55 +0000 (09:39 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 17:39:55 +0000 (09:39 -0800)
commit8b78e83bfbc12f7e9bdefd400abdfde9e6c9ac51
treebe746d4c99ddfc4dd8d739a08eb78f62652b8784
parentcf10b2853f86e714eac7117484c0d368ce710fa4
parentb887030aec0971a47ca97a18e93ff446bc7d049e
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev