From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Oct 2013 00:22:43 +0000 (-0700)
Subject: Merge 3.12-rc4 into staging-next
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~62^2~452
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02ab343f3b497421793cb4c9725587f9052f7078;p=pandora-kernel.git

Merge 3.12-rc4 into staging-next

We want the staging fixes in this branch as well.

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

02ab343f3b497421793cb4c9725587f9052f7078
Reading git-diff-tree failed