From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sun, 27 Nov 2011 04:07:25 +0000 (-0800)
Subject: Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
X-Git-Tag: v3.3-rc1~154^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd7c7c3f69291baa488b8a50db683d5fbf44166a;p=pandora-kernel.git

Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

dd7c7c3f69291baa488b8a50db683d5fbf44166a
Reading git-diff-tree failed