git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 209431e ca125b5)

author	Tony Lindgren <tony@atomide.com>
	Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)
commit	21295368367beaa563b310d5492166dba158b884
tree	c8a7c44beff93c040c76788ce2f6f4916281cbd8	tree \| snapshot
parent	209431eff8afb928d72200c79153165c7d860ca0	commit \| diff
parent	ca125b5e31f5ada6844f57c5a8e7cd104d26c8fa	commit \| 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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git