Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
commitccc0d38ec13d4649d4168c1db590137df53ad783
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2009 21:33:54 +0000 (6 14:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2009 21:33:54 +0000 (6 14:33 -0700)
tree8512448edfcaeb7a0604a4872a380ff233c1f50a
parentf07502dae230a2c3b65381fd1b06e8a18b2c7525
parent75e613cdc7bb2ba3795b1bc3ddf19476c767ba68
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: fix mmconfig detection with 32bit near 4g
  PCI: use fixed-up device class when configuring device