merge to: https://github.com/RobertCNelson/linux/commit/55f5bfd4c94b923d965d47f5c1889ef8f98fcef1

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