git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 209431e ca125b5)
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into... omap-for-v4.1/prcm-dts
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)
commit21295368367beaa563b310d5492166dba158b884
treec8a7c44beff93c040c76788ce2f6f4916281cbd8tree | snapshot
parent209431eff8afb928d72200c79153165c7d860ca0commit | diff
parentca125b5e31f5ada6844f57c5a8e7cd104d26c8facommit | diff
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 diff1 | diff2 | blob | history
arch/arm/boot/dts/dra7.dtsi diff1 | diff2 | blob | history
arch/arm/mach-omap2/io.c diff1 | diff2 | blob | history
Pandora Kernel Repository