tree 01cffc11361be7d671b71ba86463f6649b39d552
parent 36bf51acc89d113f101e40f40af4ab53fbf5b60a
parent e26081808edadfd257c6c9d81014e3b25e9a6118
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1431982364 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1431982364 -0700

Merge 4.1-rc4 into staging-next

We want the fixes in here for testing and merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>