merge to: https://github.com/RobertCNelson/linux/commit/60b5f90d0fac7585f1a43ccdad06787b97eda0ab
merge to: https://github.com/RobertCNelson/linux/commit/60b5f90d0fac7585f1a43ccdad06787b97eda0ab

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

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