Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Oct 2009 16:35:50 +0000 (09:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Oct 2009 16:35:50 +0000 (09:35 -0700)
commit084d3200d523fc24d95e97797b6cdf1256bf0d1b
treea9607d0792a82026c83a81eab53dff5e1131af09
parent1442138372d19907473cfc82c37e8dd7c3359034
parent8e5132175bebaa26f8ea5036a1e942686c11cab4
Merge branch 'upstream-linus' of git://git./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