merge to: https://github.com/RobertCNelson/linux/commit/c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4
merge to: https://github.com/RobertCNelson/linux/commit/c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4

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

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