From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 19 Oct 2013 20:14:34 +0000 (-0700)
Subject: Merge 3.12-rc6 into staging-next.
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~62^2~192
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7a0fd56e4f58aec3300082fc10433052e2f1863;p=pandora-kernel.git

Merge 3.12-rc6 into staging-next.

We want these fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

f7a0fd56e4f58aec3300082fc10433052e2f1863
Reading git-diff-tree failed