diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-07 22:27:00 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-07 22:27:00 -0700 |
commit | b3c20e983269667ecce75fa7f4b0353917a8d0d1 (patch) | |
tree | ffae8b70f4c1b66791d7b805c427388f28aabfc2 /fs/btrfs/extent_map.c | |
parent | 98abaf1370c932db38a23b270f86689b66b34cdf (diff) | |
parent | e65714740d65237c40878b63acad6bf921481974 (diff) | |
download | blackbird-op-linux-b3c20e983269667ecce75fa7f4b0353917a8d0d1.tar.gz blackbird-op-linux-b3c20e983269667ecce75fa7f4b0353917a8d0d1.zip |
Merge tag 'mvebu-soc-3.17' of git://git.infradead.org/linux-mvebu into next/soc
Merge "mvebu SoC changes for v3.17" from Jason Cooper:
- kirkwood
* add setup file for netxbig LEDs (non-trivial DT binding doesn't exist yet)
- mvebu
* staticize where needed
* add CPU hotplug for Armada XP
* add public datasheet for Armada 370
* don't apply thermal quirk by default
* get SoC ID from the system controller when possible
* tag 'mvebu-soc-3.17' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Staticize mvebu_cpu_reset_init
ARM: mvebu: Staticize armada_370_xp_cpu_pm_init
ARM: mvebu: Staticize armada_375_smp_cpu1_enable_wa
ARM: mvebu: Use system controller to get the soc id when possible
ARM: mvebu: Use the a standard errno in mvebu_get_soc_id
ARM: mvebu: Don't apply the thermal quirk if the SoC revision is unknown
Documentation: arm: add URLs to public datasheets for the Marvell Armada 370 SoC
ARM: mvebu: implement CPU hotplug support for Armada XP
ARM: mvebu: export PMSU idle enter/exit functions
ARM: mvebu: slightly refactor/rename PMSU idle related functions
ARM: mvebu: remove stub implementation of CPU hotplug on Armada 375/38x
ARM: Kirkwood: Add setup file for netxbig LEDs
ARM: mvebu: mark armada_370_xp_pmsu_idle_prepare() as static
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/btrfs/extent_map.c')
0 files changed, 0 insertions, 0 deletions