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

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