| author | Arnd Bergmann <arnd@arndb.de> | |
| Tue, 17 Jul 2012 21:25:58 +0000 (23:25 +0200) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Tue, 17 Jul 2012 21:25:58 +0000 (23:25 +0200) | ||
| commit | 77e77e1b61b422698a17da9eaafe6ce89dc242e2 | |
| tree | 398d0e7c2064a9d81c85cc699aa3a703a33451fa | tree | snapshot (tar.xz tar.gz zip) |
| parent | ff6091436239f618205bfcc86fb5bda4e28f47a1 | commit | diff |
| parent | 2aa1ecf731fc4211a6b453167dff44c778789743 | commit | diff |
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim <kgene.kim@samsung.com>:
This is general development for Samsung stuff for v3.6
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
ARM: EXYNOS: Make combiner_init function static
ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
From Kukjin Kim <kgene.kim@samsung.com>:
This is general development for Samsung stuff for v3.6
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
ARM: EXYNOS: Make combiner_init function static
ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
Signed-off-by: Arnd Bergmann <arnd@arndb.de>