From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 4 Mar 2007 21:25:28 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.21-rc3~99
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=70077f2fab35ed3d73631fc47d8c572b560ecabd;p=linux-2.6-omap-h63xx.git

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
---

70077f2fab35ed3d73631fc47d8c572b560ecabd