From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Apr 2008 15:06:27 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.25-rc9~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b9004baac077fb472cc7ac8293f2a9fc918d22;p=linux-2.6

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata/sata_fsl: Remove unused variable in sata_fsl_probe
  pata_sil680: Fix build on arch/ppc
---

c5b9004baac077fb472cc7ac8293f2a9fc918d22