From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Jul 2011 14:28:51 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v3.0-rc7~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2169ce92ca996bdbb0baa8b99f928eb5e9a8f3ab;p=~emulex%2Finfiniband.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: conditional resource-reallocation through kernel parameter pci=realloc
---

2169ce92ca996bdbb0baa8b99f928eb5e9a8f3ab