merge to: https://github.com/RobertCNelson/linux/commit/894e552cfaa3389f934dc68180bac692aebcf26b
merge to: https://github.com/RobertCNelson/linux/commit/894e552cfaa3389f934dc68180bac692aebcf26b

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

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