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

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