summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-01-02 11:39:51 -0800
committerOlof Johansson <olof@lixom.net>2014-01-02 11:39:51 -0800
commit26d5f92adf87b1267feb8727ec59c4d0c0d933be (patch)
treea78b0a3876de5512eb073f40a56a3d9e93990d43 /drivers
parent615e303e241cafa2ecf6452183532c2aff607920 (diff)
parent11dc35e4a24c7e650c40077b7843dcda1e9775c3 (diff)
downloadlinux-26d5f92adf87b1267feb8727ec59c4d0c0d933be.tar.bz2
Merge tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu into next/cleanup
From Jason Cooper: mvebu SoC changes for v3.14 (incremental #2) - mvebu - some Armada cleanup to prep for a new SoC in mach-mvebu/ * tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: move Armada 370/XP specific definitions to armada-370-xp.h ARM: mvebu: remove prototypes of non-existing functions from common.h ARM: mvebu: move ARMADA_XP_MAX_CPUS to armada-370-xp.h Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions