tree b39c158f9df27826d18f8c8dc2e03fb1eed42d40
parent 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b
parent c4e5fadd2a6fc0da465dcde761877d9a87313b33
author Linus Torvalds <torvalds@linux-foundation.org> 1210700915 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210700915 -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:
  ACPI/PCI: another multiple _OSC memory leak fix
  x86/PCI: X86_PAT & mprotect
  PCI: enable nv_msi_ht_cap_quirk for ALi bridges
  PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
  ACPI/PCI: handle multiple _OSC
  ACPI/PCI: handle multiple _OSC
  x86/PCI: fix broken ISA DMA
  PCI ACPI: fix uninitialized variable in __pci_osc_support_set