From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Jul 2010 22:05:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
X-Git-Tag: v2.6.35-rc6~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2044f2282d7558c765270d78e19dbdcf6190ca71;p=linux.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: fall back to original BIOS BAR addresses
---

2044f2282d7558c765270d78e19dbdcf6190ca71