From: Olof Johansson Date: Mon, 27 Jul 2015 18:43:52 +0000 (+0200) Subject: Merge tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~1182^2~11 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0e83c71cbd3b675757008516ff0f3db71d5b2e12;p=firefly-linux-kernel-4.4.55.git Merge tag 'prima2-defconfig-for-4.2' of git://git./linux/kernel/git/baohua/linux into next/defconfig Merge "CSR prima2_defconfig fixes for 4.2" from Barry Song: enable SiRFSoC device drivers in CSR prima2_defconfig make savedefconfig at first, then enable 1. sdhci driver 2. onkey 3. rtc 4. hwspinlock for prima2_defconfig * tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: prima2_defconfig: enable build for hwspinlock ARM: prima2_defconfig: enable build for RTC ARM: prima2_defconfig: enable build for misc input ARM: prima2_defconfig: enable build for SiRFSoC SDHC host ARM: prima2_defconfig: fix the outdated defconfig Signed-off-by: Olof Johansson --- 0e83c71cbd3b675757008516ff0f3db71d5b2e12