From: Arnd Bergmann Date: Fri, 23 May 2014 22:07:01 +0000 (+0200) Subject: Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux into next... X-Git-Tag: firefly_0821_release~176^2~3465^2~45^2~11 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c6a7d1c6c2da4da8f4832cec78c59d142b828cf6;p=firefly-linux-kernel-4.4.55.git Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux into next/defconfig Merge "Allwinner defconfig changes, take 2" from Maxime Ripard: Add the A31 reset driver to the sunxi-related defconfigs * tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux: ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig ARM: sunxi: Add A31 reset driver to sunxi_defconfig ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG Signed-off-by: Arnd Bergmann --- c6a7d1c6c2da4da8f4832cec78c59d142b828cf6