merge to: https://github.com/RobertCNelson/linux/commit/774868c7094d35b4518be3d0e654de000a5d11fc

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