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

Merge 3.12-rc4 into tty-next

We want the tty fixes in this branch as well.

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

97a7729a5c2f01faa076f38a7ec010961b456823
Reading git-diff-tree failed