Pull misc-for-upstream into release branch
Len Brown authored

Conflicts:

	drivers/usb/misc/appledisplay.c
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
81450b73