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

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

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