merge to: https://github.com/RobertCNelson/linux/commit/6391f34e844c71ebf645058b2b643f70fed5b990

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