merge to: https://github.com/RobertCNelson/linux/commit/52caa59ed335616c5254adff7911465a57ed9f14

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