tree df444789f84a638918319fa2a93ea01a9bb310b5
parent 7775c9753b94fe429dc4323360d6502c95e0dd6e
parent 81d5575a48f49f494289a1299a32e4e5e41fbf40
author Linus Torvalds <torvalds@linux-foundation.org> 1213475576 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213475576 -0700

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:
  PCI: fixup write combine comment in pci_mmap_resource
  x86: PAT export resource_wc in pci sysfs
  x86, pci-dma.c: don't always add __GFP_NORETRY to gfp
  suspend-vs-iommu: prevent suspend if we could not resume
  x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY
  pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
  PCI: use dev_to_node in pci_call_probe
  PCI: Correct last two HP entries in the bfsort whitelist