From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Oct 2009 16:35:50 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.32-rc4~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=084d3200d523fc24d95e97797b6cdf1256bf0d1b;p=karo-tx-linux.git

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:
  ahci: Add ifdef wrapper to ahci_gtf_filter_workaround
---

084d3200d523fc24d95e97797b6cdf1256bf0d1b