diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 19:23:57 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 19:23:57 +0300 |
| commit | 8d6d5e128f782b6bd8faa2d6d54e10732bf0d7b3 (patch) | |
| tree | 55807d087ffb4239798fdd63448207106fb1e983 /security | |
| parent | f2f456e720351028bdd84f02abb5a58ceacbdcaa (diff) | |
| parent | 02c24f7dc2449203a9309c6ecdb4feed2d884f43 (diff) | |
| download | linux-8d6d5e128f782b6bd8faa2d6d54e10732bf0d7b3.tar.xz | |
Merge tag 'sunxi-core-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Pull "Allwinner Core Additions for 3.19" from Maxime Ripard:
This has mostly been about introducing A80 support
* tag 'sunxi-core-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: make sun6i SMP ops static
ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER and RESET_CONTROLLER for sun9i
Documentation: sunxi: Add A80 datasheet link
devicetree: bindings: Document supported Allwinner sunxi SoCs
ARM: sunxi: Introduce Allwinner A80 support
devicetree: bindings: Add vendor prefix for Merrii Technology Co., Ltd.
ARM: sunxi: Add debug uart used by sun9i (Allwinner A80)
Documentation: sunxi: Update Allwinner SoC documentation (A31/A31s/A23)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions