Merge branch 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git...
authorKevin Hilman <khilman@linaro.org>
Fri, 12 Jun 2015 20:40:12 +0000 (13:40 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 12 Jun 2015 20:40:12 +0000 (13:40 -0700)
* 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm:
  ARM: fix EFM32 build breakage caused by cpu_resume_arm
  ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state
  ARM: v7 setup function should invalidate L1 cache


Trivial merge