merge to: https://github.com/RobertCNelson/linux/commit/86c7654f4a0afcbbd2fedefec01082f292b14cb4

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