mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge)
Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge)