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

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