git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0848611 d4a4f75)
Merge 4.1-rc7 into staging-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:34:44 +0000 (10:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:34:44 +0000 (10:34 -0700)
We want the staging tree fixes in here too to help with testing and
merge issues.

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

Trivial merge
Pandora Kernel Repository