merge to: https://github.com/RobertCNelson/linux/commit/4675348e78fab420e70f9144b320d9c063c7cee8

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