From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Aug 2012 16:48:31 +0000 (-0700)
Subject: Merge tty-next into 3.6-rc1
X-Git-Tag: omap-cleanup-sparseirq-for-v3.7~149
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87985a3ce723995fc7b25e598238d67154108a1;p=pandora-kernel.git

Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

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

c87985a3ce723995fc7b25e598238d67154108a1
Reading git-diff-tree failed