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)
commit8c203360a751ecbf876a8324e02c1dcbcc5dd548
treefcbdd2090785debf8e591dca9f17431d691c1066
parent0bbc298d14f89c16d6839a65bc5cc977c426492d
parentdbebe1589d3a86658f32e74396611452c5f34481
Merge branch 'for-3.6/defconfig' of git://git./linux/kernel/git/swarren/linux-tegra into next/defconfig

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>