merge to: https://github.com/RobertCNelson/linux/commit/372b1dbdd1fb5697890b937228d93cfd9c734c90
merge to: https://github.com/RobertCNelson/linux/commit/372b1dbdd1fb5697890b937228d93cfd9c734c90

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

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