]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc647a1a1122ab5d2060aad5abf9782cc28fe3ea7
tree292ce2c9135bd7b524b4710cff9a174c2967d600
parent6e71cc2a8a60be57dc03675d814a4affd5c551c0
parent11a8c7144b7fcf6922a25352c2805c4d46206726
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