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)
commit518fbd02a5482dbcc5ddbaec4124b53a5df75de8
tree440a7e0b5bb3202f0a3f8cae696fe2fa66304577
parentb8250dc4192c6adab0b9a713a11bf19afc462c96
parente1eee65f1a0cce8e49624104b3497ba3f8d35199
Merge tag 'tegra-for-3.10-defconfig' of git://git./linux/kernel/git/swarren/linux-tegra into next/soc

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>