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

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