Merge 4.1-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2015 12:38:55 +0000 (14:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2015 12:38:55 +0000 (14:38 +0200)
We want the fixes in here to make merges and testing easier.

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

Trivial merge