summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-14 18:12:49 -0700
committerOlof Johansson <olof@lixom.net>2013-06-14 18:12:49 -0700
commit4a77a932b9958ffd393581cd5350ca0ef39711de (patch)
tree3bdbd4549e8838930c0fc8ec4dd77baaa5067168 /arch/arm/mach-kirkwood
parent878384285ce3cdddf12ba3cf69966697c4ff3c7c (diff)
parent16a4b5ae32cf31e64b481ab3e2aa0ae964872123 (diff)
downloadlinux-4a77a932b9958ffd393581cd5350ca0ef39711de.tar.bz2
Merge tag 'tegra-for-3.11-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/boards
From Stephen Warren: ARM: tegra: defconfig updates Enable some new features: * The Tegra114 SPI controller, for Dalmore's SPI flash. * Set all the GPIO leds triggers to their "if you don't know, say X" value, so there are some useful triggers for the gpio-leds support. * TPS65090 charger, for Dalmore. * ASoC RT5640 machine driver, for audio on Beaver and Dalmore. Also, rebuild tegra_defconfig on top of linux-next. This should make it easier to create future defconfig patches, without extraneous diffs. * tag 'tegra-for-3.11-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: defconfig updates Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
0 files changed, 0 insertions, 0 deletions