From: Greg Kroah-Hartman Date: Mon, 27 May 2013 01:54:33 +0000 (+0900) Subject: Merge 3.10-rc3 into staging-next X-Git-Tag: v5.15~19849^2~487 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=829455bb0e994373519e3c58d403fc1148f44630;p=mirror_ubuntu-kernels.git 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 --- 829455bb0e994373519e3c58d403fc1148f44630