diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-07 21:10:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-07 21:10:17 -0700 |
| commit | 069c70cb07105521a095655e707ce9c20bcc6154 (patch) | |
| tree | 1ca8130ee071dd01fae618c7f04c84a24a2e0f09 /arch/arm/mach-ixp4xx/include | |
| parent | 8b5ca6495358872d495eb7223fc6d737ee2b9b2c (diff) | |
| parent | 35e75645f16c86918f26df1bfc2c24ad8ebb5a17 (diff) | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung fixes-2 for v3.16" from Kukjin Kim:
- fix the check for SMP configuration with using CONFIG_SMP
not just SMP
- fix the number of pwm-cells for exynos4 pwm
- fix ftrace for exynos_mct
- register exynos_mct for stable udely
- fix secondary boot addr for secure mode for exynos SoCs
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Update secondary boot addr for secure mode
clocksource: exynos_mct: Register the timer for stable udelay
clocksource: exynos_mct: Fix ftrace
ARM: dts: fix pwm-cells in pwm node for exynos4
ARM: EXYNOS: Fix the check for non-smp configuration
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include')
0 files changed, 0 insertions, 0 deletions