From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 May 2013 01:54:33 +0000 (+0900)
Subject: Merge 3.10-rc3 into staging-next
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~76^2~487
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829455bb0e994373519e3c58d403fc1148f44630;p=pandora-kernel.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 <gregkh@linuxfoundation.org>
---

829455bb0e994373519e3c58d403fc1148f44630
Reading git-diff-tree failed