Merge branch 'next/cleanup2' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:25:41 +0000 (14:25 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:25:41 +0000 (14:25 -0700)
commit5d3a0a95868a9669816da193bb284121df9031c8
tree292ce2c9135bd7b524b4710cff9a174c2967d600
parent7e95c548818d2b311090848083277fb907cfb56d
parentb98138e00d96abc85b100c9b6886f105d9868ab5
Merge branch 'next/cleanup2' into HEAD

Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dma.c
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/tegra20_clocks.c
arch/arm/mach-tegra/tegra20_clocks_data.c
arch/arm/tools/mach-types
drivers/video/Kconfig