diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-10 11:13:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-10 11:13:19 -0700 |
commit | 8425ac7a0d56731df5455c3015c59484f39eab6d (patch) | |
tree | f6ee1d3c91eeb7cdecc277aff6766d2ee7acf97d /net/atm/mpoa_proc.c | |
parent | 8f59ae0643b2057ad996ab23488e9be1ba2564f4 (diff) | |
parent | 8cf5e6dc8dd55d0f1ad46ab4046c3a8a51d2136d (diff) | |
download | op-kernel-dev-8425ac7a0d56731df5455c3015c59484f39eab6d.zip op-kernel-dev-8425ac7a0d56731df5455c3015c59484f39eab6d.tar.gz |
Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
Pull samsung fixes from Kukjin Kim:
"Here is Samsung fixes for v4.1. Since I've missed to send this via
arm-soc tree before v4.1-rc3, so I'm sending this to you directly
- fix commit ea08de16eb1b ("ARM: dts: Add DISP1 power domain for
exynos5420") which causes 'unhandled fault: imprecise external
abort' error when PD turned off. ("make DP a consumer of DISP1
power domain")
- fix 's3c-rtc' probe failure on Odriod-X2/U2/U3 boards ("add
'rtc_src' clock to rtc node for source clock of rtc")
- fix typo for 'cpu-crit-0' trip point on exynos5420/5440
- fix S2R failure on exynos5250-snow due to card power of Marvell
WiFi driver (suspend/resume) ("add keep-power-in-susped to WiFi
SDIO node")"
* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for exynos5250-snow
ARM: dts: Fix typo in trip point temperature for exynos5420/5440
ARM: dts: add 'rtc_src' clock to rtc node for exynos4412-odroid boards
ARM: dts: Make DP a consumer of DISP1 power domain on Exynos5420
Diffstat (limited to 'net/atm/mpoa_proc.c')
0 files changed, 0 insertions, 0 deletions