OSDN Git Service

Merge remote-tracking branch 'aosp/android-4.4' into kernel-4.4
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 19 Apr 2017 15:36:54 +0000 (23:36 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 19 Apr 2017 15:36:54 +0000 (23:36 +0800)
commitc656e6526dcc08cf63dc73b6e6ec492f1520e4ec
tree47fa788bdec8c70db0e3dd9227bb40b1faeb4796
parent59c5aecde5960f62d4126d041ab1ab3c876e3012
parentf431972e7df848e84dd12350988d5d44a57848e8
Merge remote-tracking branch 'aosp/android-4.4' into kernel-4.4

Conflicts:
drivers/usb/core/hcd.c
include/linux/usb.h
15 files changed:
arch/x86/entry/vdso/Makefile
drivers/android/Kconfig
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_pm.c
drivers/media/usb/uvc/uvc_driver.c
drivers/mmc/host/sdhci.c
drivers/usb/core/config.c
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
fs/ext4/ext4.h
fs/ext4/super.c
include/linux/usb.h
net/wireless/nl80211.c
sound/pci/hda/patch_realtek.c