merge to: https://github.com/RobertCNelson/linux/commit/55101e2d6ce1c780f6ee8fee5f37306971aac6cd

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