diff options
| author | Kukjin Kim | 2013-03-09 08:56:34 +0100 |
|---|---|---|
| committer | Kukjin Kim | 2013-03-09 08:56:34 +0100 |
| commit | 8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch) | |
| tree | 3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /drivers/clk/Makefile | |
| parent | Merge branch 'next/timer-samsung' into next/clk-exynos (diff) | |
| parent | ARM: EXYNOS: move mct driver to drivers/clocksource (diff) | |
| download | kernel-qcow2-linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.gz kernel-qcow2-linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.xz kernel-qcow2-linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.zip | |
Merge branch 'next/mct-exynos' into next/clk-exynos
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
Diffstat (limited to 'drivers/clk/Makefile')
0 files changed, 0 insertions, 0 deletions