merge to: https://github.com/RobertCNelson/linux/commit/55101e2d6ce1c780f6ee8fee5f37306971aac6cd
merge to: https://github.com/RobertCNelson/linux/commit/55101e2d6ce1c780f6ee8fee5f37306971aac6cd

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

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