commit | 2044f2282d7558c765270d78e19dbdcf6190ca71 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 18 15:05:22 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 18 15:05:22 2010 -0700 |
tree | 03b2c4d211fa8e7e2ef8c489d28a16442f030d57 | |
parent | bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d [diff] | |
parent | 58c84eda07560a6b75b03e8d3b26d6eddfc14011 [diff] |
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