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

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