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

Merge 3.12-rc6 into char-misc-next

We want the fixes in here as well.

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

dfc568e6bc08916f1035af456e4631c47166b5cf
Reading git-diff-tree failed