merge to: https://github.com/RobertCNelson/linux/commit/29fdd5ba6297f865046e3793481be4979f75d85a

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