tree 7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a
parent 42b4212baa28ebb07147c1de3990c596e7612e97
parent e4aa937ec75df0eea0bee03bffa3303ad36c986b
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1369619673 +0900
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1369619673 +0900

Merge 3.10-rc3 into staging-next

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>