diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-13 16:08:06 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-13 16:08:06 -0700 |
commit | e3643b77de143c5548ec93abd8aa68f4123295ea (patch) | |
tree | 41981957bc93e8211fe55cd04b7cac47e74bc770 /arch/arm/mach-s3c24xx/mach-osiris.c | |
parent | 86ca5b6fef2bf1aa77a62f29d844400e4fed8dde (diff) | |
parent | 44b2cef5ae6da48523fa634230ca66107110a7dd (diff) | |
download | op-kernel-dev-e3643b77de143c5548ec93abd8aa68f4123295ea.zip op-kernel-dev-e3643b77de143c5548ec93abd8aa68f4123295ea.tar.gz |
Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
* 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
PM / devfreq: update the name of EXYNOS clock registers that were omitted
PM / devfreq: update the name of EXYNOS clock register
ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
ARM: EXYNOS: use static declaration on regarding clock
ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
(includes an update to v3.3-rc6)
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-osiris.c')
0 files changed, 0 insertions, 0 deletions