projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 474118d e8e06ea)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jan 2010 00:33:12 +0000 (16:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jan 2010 00:33:12 +0000 (16:33 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: remove IOH range fetching
  PCI: fix nested spinlock hang in aer_inject


Trivial merge
John Crispins staging tree