merge to: https://github.com/RobertCNelson/linux/commit/12d7aacab56e9ef185c3a5512e867bfd3a9504e4

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