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

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