tree 6e2d3eae7532040f070888eb6116fe917f9648e0
parent 968ab1838a5d48f02f5b471aa1d0e59e2cc2ccbc
parent e25cd062b16ed1d41a157aec5a108abd6ff2e9f9
author Linus Torvalds <torvalds@linux-foundation.org> 1289858493 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289858493 -0800

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: sysfs: fix printk warnings
  PCI: fix pci_bus_alloc_resource() hang, prefer positive decode
  PCI: read current power state at enable time
  PCI: fix size checks for mmap() on /proc/bus/pci files
  x86/PCI: coalesce overlapping host bridge windows
  PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area