merge to: https://github.com/RobertCNelson/linux/commit/21e20e22d4e9d6ae8504c7275049a57ad4d1b71f
merge to: https://github.com/RobertCNelson/linux/commit/21e20e22d4e9d6ae8504c7275049a57ad4d1b71f

Signed-off-by: Robert Nelson <d6c41255011d14bfa93d8562b946ca186cfa0c7b@gmail.com>

datatranslation/linux-dev,ruisebastiao/linux-dev,RobertCNelson/linux-dev,ljtale/linux-dev,eliasbakken/linux-dev