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

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