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)
1  2 
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/pm44xx.c

Simple merge