Merge 3.15-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2014 04:38:34 +0000 (21:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2014 04:38:34 +0000 (21:38 -0700)

Trivial merge