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

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