merge to: https://github.com/RobertCNelson/linux/commit/dec8e46178bad9f1717a948572d76e0f804be801

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