git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 42b4212 e4aa937)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
commit	829455bb0e994373519e3c58d403fc1148f44630
tree	7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a	tree \| snapshot (tar.gz zip)
parent	42b4212baa28ebb07147c1de3990c596e7612e97	commit \| diff
parent	e4aa937ec75df0eea0bee03bffa3303ad36c986b	commit \| 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>