diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:13:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:13:55 +0100 |
| commit | 4eca459bc10d8400407d0fc04e90dac45b571c87 (patch) | |
| tree | 02dac5128653db41bc732c3649402b99d70d4c41 /fs/Kconfig | |
| parent | d686ce4204c5dc131396f1fca81beebc46cb8cdb (diff) | |
| parent | f956a785a282f6b5a3e7d59937548f8b7c04d1ac (diff) | |
| download | linux-4eca459bc10d8400407d0fc04e90dac45b571c87.tar.gz | |
Merge tag 'integrator-v3.19-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
Pull "ARM SoC Integrator updates for v3.19" from Linus Walleij: Integrator updates for the v3.19 merge cycle on top of the multiplatform patches, this moves out some drivers and reduced the amount of code carried in arch/arm/mach-integrator. - Move the Integrator/AP timer to drivers/clocksource - Move the restart functionality to the device tree, patches to enable restart for the Integrator have been merged to the reset tree (orthogonal) - Move debug LEDs to device tree (using the syscon LED driver merged for v3.18) - Move core module LEDs to device tree (using the syscon LED driver merged for v3.18) - Move the SoC driver (chip ID etc) to drivers/soc/versatile/soc-integrator.c * tag 'integrator-v3.19-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: soc: move SoC driver for the ARM Integrator ARM: integrator: move core module LED to device tree ARM: integrator: move debug LEDs to syscon LED driver ARM: integrator: move restart to the device tree ARM: integrator: move AP timer to clocksource Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/Kconfig')
0 files changed, 0 insertions, 0 deletions