merge to: https://github.com/RobertCNelson/linux/commit/12d7aacab56e9ef185c3a5512e867bfd3a9504e4
merge to: https://github.com/RobertCNelson/linux/commit/12d7aacab56e9ef185c3a5512e867bfd3a9504e4

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

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