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

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