Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:25:28 +0000 (13:25 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:25:28 +0000 (13:25 -0800)
commit70077f2fab35ed3d73631fc47d8c572b560ecabd
tree1e979a5eb60c7063e3bc99f7a762f4cdb0ab4203
parent85a5d77abea94c3496f63dc3ba72f5f932daa799
parent527e1e1879cb10958b7ad4e04b3877abf54df3bd
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] pata_jmicron: build fix