]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:44:21 +0000 (12:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:44:21 +0000 (12:44 +1100)
1  2 
drivers/hid/i2c-hid/i2c-hid.c
drivers/pci/hotplug/pciehp.h
drivers/pci/pci-acpi.c

Simple merge
Simple merge
Simple merge