]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 12:05:57 +0000 (13:05 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 12:05:57 +0000 (13:05 +0100)
commitf4533bc5ee208c46905b4027cc4c9bd790cc2829
treed20dd5eb3ab189dd2b0a8f3160ffe81233445807
parent2ea4f41e687ed5328e4f0b875467fa5c09375059
parent0bc5f854079a6cc22597d107838a0abc1299d164
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