git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42b4212 e4aa937)
Merge 3.10-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.

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

Trivial merge
Pandora Kernel Repository