git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Olof Johansson <olof@lixom.net>
	Mon, 1 Oct 2012 21:19:17 +0000 (14:19 -0700)
committer	Olof Johansson <olof@lixom.net>
	Mon, 1 Oct 2012 21:19:17 +0000 (14:19 -0700)
commit	6d55d5968a8622f3ea20ec40737aea1cfba6438c
tree	72481307c22f9b6170591cece793ea24f97a9ddb	tree \| snapshot (tar.gz zip)
parent	f7b967bffefe69f1ad8b79e263237ec1feba7b9b	commit \| diff
parent	b6e3b5c2fea9c76617e101cbbc54ed14961f9dee	commit \| diff

Merge branch 'next/soc' into HEAD

Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock-exynos5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx51-imx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clkt_dpll.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/dpll3xxx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh73a0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt-tegra20.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/devs.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/Makefile	diff1 \|	diff2 \|	blob \| history

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock-exynos5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx51-imx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clkt_dpll.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/dpll3xxx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh73a0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt-tegra20.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/devs.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/Makefile	diff1 \|	diff2 \|	blob \| history