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

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