merge to: https://github.com/RobertCNelson/linux/commit/75ff24fa52f0cc512ceee4c377632b91a3a80811

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