tree 60d29e2a3b095e9d14657cc6e02daba0a1b5f63d
parent 891a9894ee2e17646b29117635d2c7adfb58ce60
parent 837c4ef13c44296bb763a0ca0e84a076592474cf
author Linus Torvalds <torvalds@linux-foundation.org> 1276290944 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1276290944 -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: clear bridge resource range if BIOS assigned bad one
  PCI: hotplug/cpqphp, fix NULL dereference
  Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
  PCI: change resource collision messages from KERN_ERR to KERN_INFO