diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 19:39:51 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 19:39:51 (GMT) |
| commit | 26d5f92adf87b1267feb8727ec59c4d0c0d933be (patch) | |
| tree | a78b0a3876de5512eb073f40a56a3d9e93990d43 /drivers/memstick | |
| parent | 615e303e241cafa2ecf6452183532c2aff607920 (diff) | |
| parent | 11dc35e4a24c7e650c40077b7843dcda1e9775c3 (diff) | |
| download | linux-26d5f92adf87b1267feb8727ec59c4d0c0d933be.tar.xz | |
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/memstick')
0 files changed, 0 insertions, 0 deletions