tree 1e979a5eb60c7063e3bc99f7a762f4cdb0ab4203
parent 85a5d77abea94c3496f63dc3ba72f5f932daa799
parent 527e1e1879cb10958b7ad4e04b3877abf54df3bd
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1173043528 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1173043528 -0800

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/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