merge to: https://github.com/RobertCNelson/linux/commit/c240a539df4e2d50f86e2f31813ff6b7334cd493

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