]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm...
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Jul 2011 16:54:04 +0000 (16:54 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 26 Jul 2011 16:54:04 +0000 (16:54 +0000)
commit768bdea1ff6fc1a596bde576d522da24a43d07a4
treef522786f152cc2956859aa72f35398829febd3c1
parent15248498afd3e46456d4e56767c06247d9d637ef
parent6c59c115b0f295434cc4f917d180fecd84d39f81
Merge branch 'next/soc' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into tmp/merge

Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h
arch/arm/mm/Kconfig
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/cm-regbits-44xx.h
arch/arm/mm/Kconfig
arch/arm/plat-omap/include/plat/clock.h