Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Thu, 29 Mar 2012 17:59:20 +0000 (10:59 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 29 Mar 2012 18:00:56 +0000 (11:00 -0700)
commita99ab88815aec12bd257e121dee06003e2401a68
tree89535cf82f33e2041af34433b8f2aa7f704ffa36
parent714daf73d0889c62e90abf4510e4fab65b4668e8
parent8c3ec84102d171a24f050a086bfc546e9de93f9f
Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git./linux/kernel/git/swarren/linux-tegra into fixes

* 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Fix device tree AUXDATA for USB/EHCI
arch/arm/mach-tegra/board-dt-tegra20.c