Merge tag 'tegra-for-3.10-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 15:04:36 +0000 (17:04 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 15:04:36 +0000 (17:04 +0200)
From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: defconfig changes

Various new features are enabled:

* Tegra114 support.
* Various PMICs and related options for Tegra114 platforms.
* KEYBOARD_GPIO, mainly as a suspend wakeup source.
* tegra_defconfig is rebuilt based on v3.9-rc1, which causes various
  layout changes.

This branch is based on v3.9-rc1.

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge