]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 11:13:58 +0000 (12:13 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 11:13:58 +0000 (12:13 +0100)
commit45780b652dfba3a876fc47f4aa77fe28d7c73a12
tree7d7ef5cd0297688a4bc6ae8bdb80709e943f34ae
parent75e1f4d9895d2a787a37a4f9c14e1c4068abeea7
parentaf91d4b29b5247b0bf6e79953efe71de6604da02
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/i2c/i2c-core.c
MAINTAINERS
drivers/i2c/i2c-core.c
drivers/pci/hotplug/acpi_pcihp.c
include/linux/acpi.h