Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jul 2010 22:05:22 +0000 (15:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jul 2010 22:05:22 +0000 (15:05 -0700)
commit2044f2282d7558c765270d78e19dbdcf6190ca71
tree03b2c4d211fa8e7e2ef8c489d28a16442f030d57
parentbea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d
parent58c84eda07560a6b75b03e8d3b26d6eddfc14011
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: fall back to original BIOS BAR addresses