tree 03b2c4d211fa8e7e2ef8c489d28a16442f030d57
parent bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d
parent 58c84eda07560a6b75b03e8d3b26d6eddfc14011
author Linus Torvalds <torvalds@linux-foundation.org> 1279490722 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279490722 -0700

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