From: Matt Porter <mporter@linaro.org>
Date: Fri, 14 Mar 2014 15:20:43 +0000 (-0400)
Subject: Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3
X-Git-Tag: v3.15-rc1~79^2~10^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=833688f4e49f659ad90a3ea7e2905720774c3f61;p=~emulex%2Finfiniband.git

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
---

833688f4e49f659ad90a3ea7e2905720774c3f61