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

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