| commit | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 28 20:40:17 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 28 20:40:17 2010 -0700 |
| tree | 4cafc47b8eaed5d40b2d8705c9f9036fe6b463d3 | |
| parent | d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f [diff] | |
| parent | 48728e077480910df45baabc5f87b04276348c90 [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: x86/PCI: compute Address Space length rather than using _LEN x86/PCI: never allocate PCI MMIO resources below BIOS_END