merge to: https://github.com/RobertCNelson/linux/commit/782d59c5dfc5ac39ac8cfb4c6dd40597938dde9c

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