Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2011 14:28:51 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2011 14:28:51 +0000 (07:28 -0700)
commit2169ce92ca996bdbb0baa8b99f928eb5e9a8f3ab
treeb3569e3c80e9b92042d4e750438ade54320fe4a6
parent7fc7693627f363820c0e95d1e082f73c197f83c4
parentf483d3923dc3a6394c483e28ccb3fe700bdf399e
Merge branch 'for-linus' of git://git./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