Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:17:02 +0000 (09:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:17:02 +0000 (09:17 -0700)
commit066455d471e997adbcc98dda62eaf461e8b6556e
tree4d9b6fb879dff695fa242702d7c4635687ae829d
parentea38280c2a6e22997cf05bfea0d9391ddea1da24
parent55a1098476619d5d8f4cdae7240ea759274dead7
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:
  Revert "PCI: get larger bridge ranges when space is available"