diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 18:35:11 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 18:35:11 (GMT) |
commit | 0a44e68ca0a8456ed33c62c99b8c42bebdcbbc8c (patch) | |
tree | df8a9dfd74908d0b82746861a10170805bac1d47 /arch/arm/mm/init.c | |
parent | 10c8e0562057b5d64ea170feab148e1550420030 (diff) | |
parent | dc1c5a84c7c97318f0f9cfb66198ef2f5db3dcb3 (diff) | |
download | linux-0a44e68ca0a8456ed33c62c99b8c42bebdcbbc8c.tar.xz |
Merge tag 'defconfig-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC defconfig updates from Olof Johansson:
"We broke this out in a separate branch since some defconfigs now are
shared between maintainers, and having them merged in through separate
topics (drivers/soc/etc) is a recipe for conflicts.
Most of this is removal of two defconfigs:
- Kirkwood, now folded into mvebu/multi_v5
- Renesas genmai, removed platform
- major defconfig refresh for exynos
- various updates on the other multi-defconfigs and others (tegra,
socfpga, shmobile):
* tag 'defconfig-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
ARM: multi_v7_defconfig: Enable TI PIPE3 PHY driver
ARM: config: enable ARCH_HIX5HD2
ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY
ARM: multi_v7_defconfig: Enable ST's (S)ATA driver
ARM: multi_v7_defconfig: add ST Keyscan driver
ARM: update multi_v7_defconfig for STI
ARM: multi_v7_defconfig: Configure in ST's Thermal Controller
ARM: exynos_defconfig: Update exynos_defconfig
ARM: shmobile: defconfig: Remove MACH_GENMAI
ARM: mvebu: update mvebu_v7_defconfig with cpufreq support
ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig
ARM: shmobile: genmai: remove defconfig
ARM: socfpga: Update socfpga_defconfig
ARM: Kirkwood: Remove kirkwood_defconfig
ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig
ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig
ARM: mvebu: add devtmpfs to mvebu_v5_defconfig
ARM: mvebu: add appended DTB support in mvebu_v5_defconfig
ARM: multi_v7: enable igb, stmpe, lm95245, pwm leds
ARM: multi_v7_defconfig: Enable ST's I2C driver
...
Diffstat (limited to 'arch/arm/mm/init.c')
0 files changed, 0 insertions, 0 deletions