Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 53744f75 authored by alexax66's avatar alexax66 Committed by alexax66
Browse files
Conflicts:
	build_kernel.sh
	drivers/battery/Kconfig
	drivers/battery/s2mu003_charger.c
	drivers/battery/sec_battery.c
	drivers/char/Makefile
	drivers/char/mst_ctrl.c
	drivers/cpufreq/exynos-smp-cpufreq.c
	drivers/gpu/arm/t72x/r7p0/mali_kbase_context.c
	drivers/gpu/arm/t72x/r7p0/mali_kbase_defs.h
	drivers/gpu/arm/t72x/r7p0/mali_kbase_mem_profile_debugfs.c
	drivers/gpu/arm/t72x/r7p0/platform/exynos/gpu_control.c
	drivers/gpu/arm/t72x/r7p0/platform/exynos/gpu_custom_interface.c
	drivers/gpu/arm/t72x/r7p0/platform/exynos/gpu_dvfs_api.c
	drivers/gpu/arm/t72x/r7p0/platform/exynos/gpu_dvfs_handler.h
	drivers/gpu/arm/t72x/r7p0/platform/exynos/gpu_exynos7580.c
	drivers/gpu/arm/t72x/r7p0/platform/exynos/mali_kbase_platform.c
	drivers/gpu/arm/t72x/r7p0/platform/exynos/mali_kbase_platform.h
	drivers/md/dm-crypt.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/bhy/bhy_core.c
	drivers/misc/bhy/bhy_core.h
	drivers/motor/sec_vib.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/Makefile.jb
	drivers/net/wireless/bcmdhd/Makefile.jbp
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_custom_exynos.c
	drivers/net/wireless/bcmdhd/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/document/ChangeHistory.txt
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/regulator/core.c
	drivers/video/exynos/decon_7580/Makefile
	drivers/video/exynos/decon_7580/decon_core.c
	drivers/video/exynos/decon_7580/panels/dsim_panel.c
	drivers/video/exynos/decon_7580/panels/dsim_panel.h
	drivers/video/exynos/decon_7580/panels/ea8061_lcd_ctrl.c
	drivers/video/exynos/decon_7580/panels/ea8064g_lcd_ctrl.c
	drivers/video/exynos/decon_7580/panels/ltm184hl01_lcd_ctrl.c
	drivers/video/exynos/decon_7580/panels/mdnie.h
	drivers/video/exynos/decon_7580/panels/mdnie_lite.c
	drivers/video/exynos/decon_7580/panels/mdnie_tuning.c
	drivers/video/exynos/decon_7580/panels/s6e3aa2_a3xe_lcd_ctrl.c
	drivers/video/exynos/decon_7580/panels/s6e3fa3_a5xe_lcd_ctrl.c
	fs/ecryptfs/Kconfig
	fs/ecryptfs/crypto.c
	fs/ecryptfs/ecryptfs_kernel.h
	fs/ecryptfs/file.c
	fs/ecryptfs/inode.c
	fs/ecryptfs/main.c
	fs/ecryptfs/mm.c
	fs/ecryptfs/super.c
	fs/sdcardfs/derived_perm.c
	fs/sdcardfs/file.c
	fs/sdcardfs/inode.c
	fs/sdcardfs/lookup.c
	fs/sdcardfs/main.c
	fs/sdcardfs/packagelist.c
	fs/sdcardfs/sdcardfs.h
	fs/sdcardfs/super.c
	fs/sdcardfs/version.h
	fs/super.c
	include/linux/mm.h
	kernel/auditsc.c
	security/Makefile
	security/keys/keyctl.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/include/avc.h
	security/selinux/include/security.h
	security/selinux/ss/avtab.c
	security/selinux/ss/avtab.h
	security/selinux/ss/conditional.c
	security/selinux/ss/conditional.h
	security/selinux/ss/policydb.c
	security/selinux/ss/services.c
	security/selinux/ss/services.h
parent 4c5a4f11
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment