Merge branch 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarr...
authorOlof Johansson <olof@lixom.net>
Thu, 10 May 2012 06:24:53 +0000 (23:24 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 10 May 2012 06:26:20 +0000 (23:26 -0700)
commita72ce69097a2709bdbda34e2f77b8388a1323923
tree526ea58089c5b0df7873f7d86fa3e314ec848855
parent86558257aa6716eda0ef6c94e0f579dc64fe95c3
parent65e8d272ba483dac3b5f724e938dda099e49a7e1
Merge branch 'for-3.5/cleanup' of git://git./linux/kernel/git/swarren/linux-tegra into next/cleanup

By Arnd Bergmann (1) and Danny Kukawka (1)
via Stephen Warren
* 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: do not hide dma declarations
  ARM: tegra: fix multiple asm/hardware/gic.h inclusion

Signed-off-by: Olof Johansson <olof@lixom.net>