merge to: https://github.com/RobertCNelson/linux/commit/163e40743f730e0982b0df28e57e0bed71442a77

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