From: Arnd Bergmann Date: Thu, 25 Sep 2014 15:55:25 +0000 (+0200) Subject: Merge tag 'tegra-for-3.18-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=413cb0036c24b91ba057fbb8b125b4bbf6afa55a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'tegra-for-3.18-defconfig' of git://git./linux/kernel/git/swarren/linux-tegra into next/defconfig Pull "ARM: tegra: tegra_defconfig changes for 3.18" from Stephen Warren: Support is enabled for Venice2's touchpad, and Tegra124's AHCI (SATA) controller, as used on Jetson TK1. Signed-off-by: Arnd Bergmann * tag 'tegra-for-3.18-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: enable Atmel touchpad in defconfig ARM: tegra: Add options for Tegra AHCI support to tegra_defconfig Contains an update to 3.17-rc2. --- 413cb0036c24b91ba057fbb8b125b4bbf6afa55a