diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-23 18:57:11 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-23 18:57:11 -0800 |
| commit | f89bc02fe535b6f14b741df2eb268ce8eb716c31 (patch) | |
| tree | f0b3585497340d92a60deb54f7b7ff3e1399e4eb /tools/lib/traceevent/plugin_function.c | |
| parent | 40d0c522a9d5f80fd89fbeb4d98d0ef044585cb5 (diff) | |
| parent | ca7c11fc8df0657ddeffc1cd98428abd739e1e10 (diff) | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical
From Kukjin Kim:
Samsung non-critical 2nd fixes for v3.14
- Correct HSMMC1 card detection type for s3c6410-mini6410
- Fix different key mapping backslash and search key for exynos5250-snow
- Fix definitions of div_mmc_pre4 divider for CLK_SET_RATE_PARENT
- Fix clock provider for mshc on exynos4412
- Fix definitions of mshc dt nodes for exynos4x12
- use mshc controller for eMMC for exynos4412-trats2
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2
ARM: dts: Fix definition of MSHC device tree nodes for exynos4x12
ARM: dts: add clock provider for mshc node for Exynos4412 SOC
clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
ARM: dts: Fix exynos5250-snow's search key to be L_META
ARM: dts: Add the missing "\" key in non-US keyboards for exynos5250-snow
ARM: S3C64XX: Correct card detect type for HSMMC1 for MINI6410
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/lib/traceevent/plugin_function.c')
0 files changed, 0 insertions, 0 deletions