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)
commitf05b3563f88b357f8ceedf0cca2b10ae9a4a9dca
tree0d6a59c7d9654db615fe417c7920a4b6ec40f320
parentfca2447c7d09f1c0852e556a3884209879a6fa7c
parent06d96e1e6dbdcc88d20b21cc54ee8388c074f47f
Merge branch 'for-3.5/defconfig2' of git://git./linux/kernel/git/swarren/linux-tegra into next/defconfig

* 'for-3.5/defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: update defconfig