| commit | 829455bb0e994373519e3c58d403fc1148f44630 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 27 10:54:33 2013 +0900 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 27 10:54:33 2013 +0900 |
| tree | 7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a | |
| parent | 42b4212baa28ebb07147c1de3990c596e7612e97 [diff] | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b [diff] |
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>