diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 14:51:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 14:51:10 -0700 |
| commit | 03a1e74cad817a381b4789fb9cc39c47c263c8a8 (patch) | |
| tree | 3f9bd36b1cc4fcfdb25d065033423dd9e135f6ee /net | |
| parent | 1eddf578e25521267cf734935b2a856ed2be28fc (diff) | |
| parent | cfdda3535f87e752780ca18a57d13db58f6a6913 (diff) | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung 2nd fixes for v4.0" from Kukjin Kim:
- Fix build breakage exynos cpuidle driver on !SMP
because it is coupled built-in so added check for SMP.
- Fix lid, power pin-functions and mmc node updates
for exynos5250-spring: Fixes commit ID 53dd4138bb0a
("ARM: dts: Add exynos5250-spring device tree")
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix build breakage cpuidle on !SMP
ARM: dts: fix lid and power pin-functions for exynos5250-spring
ARM: dts: fix mmc node updates for exynos5250-spring
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions