From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Jul 2008 20:57:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: Ubuntu-5.0.0-8.9~32404
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5042d99795d3d817bef2f4cc46e953bee9bf7398;p=mirror_ubuntu-disco-kernel.git

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 sparse endianness warnings in proc.c
  PCI PM: make more PCI PM core functionality available to drivers
  PCI/DMAR: don't assume presence of RMRRs
  PCI hotplug: fix error path in pci_slot's register_slot
---

5042d99795d3d817bef2f4cc46e953bee9bf7398