summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-06 14:33:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-06 14:33:54 -0700
commitccc0d38ec13d4649d4168c1db590137df53ad783 (patch)
tree8512448edfcaeb7a0604a4872a380ff233c1f50a /drivers/power
parentf07502dae230a2c3b65381fd1b06e8a18b2c7525 (diff)
parent75e613cdc7bb2ba3795b1bc3ddf19476c767ba68 (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
Diffstat (limited to 'drivers/power')
0 files changed, 0 insertions, 0 deletions