From: Linus Torvalds Date: Thu, 29 Apr 2010 03:40:17 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... X-Git-Tag: v2.6.34-rc6~10 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=79dba2eaa771c3173957eccfd288e0e0d12e4d3f 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: x86/PCI: compute Address Space length rather than using _LEN x86/PCI: never allocate PCI MMIO resources below BIOS_END --- 79dba2eaa771c3173957eccfd288e0e0d12e4d3f