Merge branch 'for-v3.17/cm-prm-cleanup' of https://github.com/t-kristo/linux-pm into...
authorTony Lindgren <tony@atomide.com>
Tue, 15 Jul 2014 14:00:00 +0000 (07:00 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Jul 2014 14:00:00 +0000 (07:00 -0700)
1  2 
arch/arm/mach-omap2/control.h

Simple merge