]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'tegra-for-3.14-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Thu, 26 Dec 2013 19:05:04 +0000 (11:05 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Dec 2013 19:05:04 +0000 (11:05 -0800)
From Stephen Warren:
ARM: tegra: defconfig changes

Enable new features required by the Venice2 board.

This branch is based on v3.13-rc1, and shouldn't cause any conflicts.

* tag 'tegra-for-3.14-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: tegra_defconfig updates

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge