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

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