merge to: https://github.com/RobertCNelson/linux/commit/77c4cf17ae867ba93233b3832bda3de7adaae326

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