Merge branch 'for-3.5/defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 18:55:12 +0000 (20:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 18:55:12 +0000 (20:55 +0200)
* 'for-3.5/defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: update defconfig


Trivial merge