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)
commit833688f4e49f659ad90a3ea7e2905720774c3f61
tree1ec242f0c13e40fe9421f86561d0d81dec42fd12
parent0e8b860ac6d65209beea03ee9b718089838476ef
parentfdf4850cb5b2e5e549a18b8b41abb001bfb19e9c
Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3

ARM: mach-bcm soc updates

- add BCM5301x support
- remove GENERIC_TIME