Merge branch 'for-3.6/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:22:32 +0000 (22:22 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:22:32 +0000 (22:22 +0200)
From Stephen Warren <swarren@wwwdotorg.org>:

This branch contains a single commit which adjusts tegra_defconfig to
enable new kernel features, driven by new device tree file content and drivers.

* 'for-3.6/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