merge to: https://github.com/RobertCNelson/linux/commit/3cc69b638e11bfda5d013c2b75b60934aa0e88a1

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