Merge branch 'mvebu/soc-cpuidle' into mvebu/soc

Conflicts:
	arch/arm/mach-mvebu/pmsu.c
This commit is contained in:
Jason Cooper 2014-07-24 23:10:02 +00:00
commit 54ef3fe697
24 changed files with 559 additions and 222 deletions