| commit | ccc0d38ec13d4649d4168c1db590137df53ad783 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 06 14:33:54 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 06 14:33:54 2009 -0700 |
| tree | 8512448edfcaeb7a0604a4872a380ff233c1f50a | |
| parent | f07502dae230a2c3b65381fd1b06e8a18b2c7525 [diff] | |
| parent | 75e613cdc7bb2ba3795b1bc3ddf19476c767ba68 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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