merge to: https://github.com/RobertCNelson/linux/commit/72a67a94bcba71a5fddd6b3596a20604d2b5dcd6

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