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)
commitb4da00601edd39184fa187d5fd6dfc36232991cc
treef58bafde4efd814bb78b4f531b1eab48dcf8e561
parentd5a7d45fb5b667fd10a225ccf11fe395fb2417d9
parent5ebe6afaf0057ac3eaeb98defd5456894b446d22
Merge 4.1-rc2 into staging-next

We want the fixes in here to make merges and testing easier.

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