]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:34:14 +0000 (11:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:34:14 +0000 (11:34 -0800)
commit55871bdd03bf577c5c8fc65498ae24b7c148e1eb
tree4e5e0a751e3229835200b4be69f6c71f94c31ece
parente5d45abe1487aa856e48d6d9b857bd200b63b896
parenteb647138acefc897c0eb6eddd5d3650966dfe627
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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