Merge remote-tracking branch 'aosp/android-4.4.y' into kernel-4.4

Conflicts:
	drivers/usb/host/xhci-mem.c
	drivers/usb/host/xhci-ring.c

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/mmc/host/sdhci-acpi.c
Simple merge

diff --cc drivers/usb/core/config.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc fs/pstore/ram.c
Simple merge

diff --cc include/linux/pstore_ram.h
Simple merge