]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2009 21:33:54 +0000 (14:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2009 21:33:54 +0000 (14:33 -0700)
* '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


Trivial merge