]> 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)
commit15b11508e4ae40fac41c0ba474c4f2af867d0bb2
tree292ce2c9135bd7b524b4710cff9a174c2967d600
parenta4d1dbc033de8a3f18fe6a721d63dd96d878511d
parentc1add568ed6184b11b1e71eacdf1cec1d0be7746
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