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

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

author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 25 Apr 2018 02:09:50 +0000 (10:09 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 25 Apr 2018 02:09:50 +0000 (10:09 +0800)
commit	38bd4ce57ea5c4d9228fcdc8917404cdf3933cb0
tree	126671f4f03e530b0e5b5b79ea878f99648909d1	tree \| snapshot
parent	ed29648909854663a5a1267e6827013509914a8e	commit \| diff
parent	a35dc729372b84fb410279162b05e33f546380e1	commit \| diff

Merge remote-tracking branch 'aosp/android-4.9' into kernel-4.9

Conflicts:
Makefile
drivers/acpi/pmic/intel_pmic_xpower.c
drivers/cpufreq/cpufreq.c
fs/ext4/mballoc.c

35 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.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-input.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-designware-core.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/goodix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/main.c	diff1 \|	diff2 \|	blob \| history
drivers/video/hdmi.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history
sound/soc/generic/simple-card.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/atom/sst/sst_acpi.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/atom/sst/sst_stream.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/boards/cht_bsw_rt5645.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl-messages.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl.c	diff1 \|	diff2 \|	blob \| history

kernel

RSS Atom

About OSDN

Find Software

Develop Software

Help

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.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-input.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-designware-core.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/goodix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/main.c	diff1 \|	diff2 \|	blob \| history
drivers/video/hdmi.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history
sound/soc/generic/simple-card.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/atom/sst/sst_acpi.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/atom/sst/sst_stream.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/boards/cht_bsw_rt5645.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl-messages.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/skylake/skl.c	diff1 \|	diff2 \|	blob \| history