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

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