git » linux-kernel » commit 084d320

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

author Linus Torvalds
2009-10-09 16:35:50 UTC
committer Linus Torvalds
2009-10-09 16:35:50 UTC
parent 8e5132175bebaa26f8ea5036a1e942686c11cab4
parent 1442138372d19907473cfc82c37e8dd7c3359034
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