Merge tag 'sunxi-config64-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 23:06:24 +0000 (00:06 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 23:06:24 +0000 (00:06 +0100)
commite5db3c632130b86a9f721e6c3785fdd65324f604
treeb2e90cebcd1817cc25ee9fc9b0df3b76cbf23b47
parent5f84a8efc42597ecd0ad361e412f61d95b9bc804
parent22b0898e831bc1ffb64ce0b8452a376f0892b478
Merge tag 'sunxi-config64-for-4.6' of https://git./linux/kernel/git/mripard/linux into next/arm64

Merge "Allwinner configuration changes for ARM64, 4.6 edition" from Maxime Ripard:

Not a lot of changes for this kernel release, just a new Kconfig option and
some changes to the arm64 defconfig to add Allwinner drivers

* tag 'sunxi-config64-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  arm64: add defconfig options for Allwinner SoCs
  arm64: Introduce Allwinner SoC config option
arch/arm64/Kconfig.platforms
arch/arm64/configs/defconfig