]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:34:03 +0000 (14:34 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:34:03 +0000 (14:34 +0200)
commit022a0e218704fe48eb15b7d0d0072cfaec5f2a82
tree792e26e11d767eedd91d9920d1c6fdc991e01396
parentf7d097973e8a9cd243fc86a271b35a04a6b255c5
parent5add515830646d3a994f515c61f5bebe2b5bb40a
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/i2c/i2c-core.c
MAINTAINERS
arch/x86/Kconfig
drivers/i2c/i2c-core.c
drivers/pci/hotplug/acpi_pcihp.c
drivers/platform/x86/sony-laptop.c
include/linux/acpi.h