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

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