merge to: https://github.com/RobertCNelson/linux/commit/17b2112f332db7c2bac56926c9e627807bce3615

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