merge to: https://github.com/RobertCNelson/linux/commit/4907cdca7210c5895311bddcf05a4c85b67d8566
merge to: https://github.com/RobertCNelson/linux/commit/4907cdca7210c5895311bddcf05a4c85b67d8566

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

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