diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 17:55:25 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 17:55:25 +0200 |
commit | 413cb0036c24b91ba057fbb8b125b4bbf6afa55a (patch) | |
tree | cb264c1b460aacfc205b92013603f669c429b200 /arch/arm/mach-footbridge/ebsa285-pci.c | |
parent | 5efbc31600fb9a2ccf86585a9cd8ca0569b26f5d (diff) | |
parent | b82daf87a82fc2261f86f48d1bd0706da9e4a675 (diff) | |
download | talos-op-linux-413cb0036c24b91ba057fbb8b125b4bbf6afa55a.tar.gz talos-op-linux-413cb0036c24b91ba057fbb8b125b4bbf6afa55a.zip |
Merge tag 'tegra-for-3.18-defconfig' of git://git.kernel.org/pub/scm/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 <arnd@arndb.de>
* 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.
Diffstat (limited to 'arch/arm/mach-footbridge/ebsa285-pci.c')
0 files changed, 0 insertions, 0 deletions