]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:50:17 +0000 (11:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:50:17 +0000 (11:50 +1100)
1  2 
drivers/gpu/drm/i915/i915_drv.h
drivers/pci/hotplug/pciehp.h
drivers/pci/pci-acpi.c

Simple merge
Simple merge
Simple merge