merge to: https://github.com/RobertCNelson/linux/commit/18a1a7a1d862ae0794a0179473d08a414dd49234

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