From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2009 19:34:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.32-rc7~40
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=55871bdd03bf577c5c8fc65498ae24b7c148e1eb;p=cascardo%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: Adjust GFP mask handling for coherent allocations
  PCI ASPM: fix oops on root port removal
---

55871bdd03bf577c5c8fc65498ae24b7c148e1eb