From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Jun 2010 21:15:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.35-rc3~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eda054770e5cd0e9ee1568dfcbcf39f9ade4f545;p=~shefty%2Frdma-dev.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: 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
---

eda054770e5cd0e9ee1568dfcbcf39f9ade4f545