]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into...
authorTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)
commitfe6c7bb136eda4f0153adca46bcd968f81ad1bbd
treec8a7c44beff93c040c76788ce2f6f4916281cbd8
parentc3bfd56e71a92e06779568206abb5da030b60999
parentbeca8de4a7f422bc4c8b46f6f9ff9e6967fd2204
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup

Conflicts:
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/dra7.dtsi
arch/arm/mach-omap2/io.c