]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'next/soc' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:19:17 +0000 (14:19 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:19:17 +0000 (14:19 -0700)
commit6d55d5968a8622f3ea20ec40737aea1cfba6438c
tree72481307c22f9b6170591cece793ea24f97a9ddb
parentf7b967bffefe69f1ad8b79e263237ec1feba7b9b
parentb6e3b5c2fea9c76617e101cbbc54ed14961f9dee
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
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clkt_dpll.c
arch/arm/mach-omap2/dpll3xxx.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/setup-sh73a0.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-ux500/cpu.c
arch/arm/plat-omap/omap_device.c
arch/arm/plat-samsung/clock.c
arch/arm/plat-samsung/devs.c
drivers/clk/Makefile
drivers/clocksource/Makefile