Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3
authorMatt Porter <mporter@linaro.org>
Fri, 14 Mar 2014 15:20:43 +0000 (11:20 -0400)
committerMatt Porter <mporter@linaro.org>
Fri, 14 Mar 2014 15:20:43 +0000 (11:20 -0400)
ARM: mach-bcm soc updates

- add BCM5301x support
- remove GENERIC_TIME


Trivial merge