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

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