Merge branch 'pull/v3.18/for-omap-soc' of https://github.com/nmenon/linux-2.6-playgro...
authorTony Lindgren <tony@atomide.com>
Mon, 8 Sep 2014 22:20:15 +0000 (15:20 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 8 Sep 2014 22:20:15 +0000 (15:20 -0700)
commit887782e04f8ada770e24cfb190d2ceed3b2c4974
treeacb6a9ee8b1993d1ca15392897da60512a094dba
parentd7eb67f7fef9c046f27a975118da2324de65a90c
parent628ed4717000789bff827c5799d1aac4c1008541
Merge branch 'pull/v3.18/for-omap-soc' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/soc
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/pm44xx.c