merge to: https://github.com/RobertCNelson/linux/commit/002acf1fc16cf60e60345bd68e03734628505b83

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