merge to: https://github.com/RobertCNelson/linux/commit/04012e3076943f17c8cfc77a196701c8f0b8964f

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