merge to: https://github.com/RobertCNelson/linux/commit/3a1122d26c62d4e8c61ef9a0eaba6e21c0862c77

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