git.osdn.net Git - android-x86/kernel.git/commit

(root) / android-x86 / kernel.git / commit

author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Sun, 20 Jun 2021 07:58:17 +0000 (15:58 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Sun, 20 Jun 2021 07:58:17 +0000 (15:58 +0800)
commit	0676905e8791e9a838216e02d4974b2c965e3d4b
tree	1b2aeb301eeeca97792b36cb765dd7b71f595c05	tree \| snapshot
parent	a00f6800c7ebfd730db71e0da0dbcbffce47701f	commit \| diff
parent	60080b53629d749f14cf6981b1602de6c19dd46e	commit \| diff

Merge remote-tracking branch 'aosp/android-4.19-stable' into kernel-4.19

Conflicts:
arch/x86/Makefile
drivers/acpi/bus.c

28 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/tools/relocs.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_h5.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-multitouch.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/intel-hid.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/intel_punit_ipc.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/pmc_atom.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
include/acpi/acexcep.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
security/commoncap.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/boards/bytcr_rt5640.c	diff1 \|	diff2 \|	blob \| history

kernel

RSS Atom

About OSDN

Find Software

Develop Software

Help

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/tools/relocs.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_h5.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-multitouch.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/intel-hid.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/intel_punit_ipc.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/pmc_atom.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
include/acpi/acexcep.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
security/commoncap.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/boards/bytcr_rt5640.c	diff1 \|	diff2 \|	blob \| history