projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9e80b7 48728e0)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Apr 2010 03:40:17 +0000 (20:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Apr 2010 03:40:17 +0000 (20:40 -0700)
* '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


Trivial merge
John Crispins staging tree