From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jan 2010 00:33:12 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v3.12-rc1~11475
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d29935ff0773fe466e957f17284ca777a2aaa89;p=kernel%2Fkernel-generic.git

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: remove IOH range fetching
  PCI: fix nested spinlock hang in aer_inject
---

3d29935ff0773fe466e957f17284ca777a2aaa89