Greg Kroah-Hartman c87985a3ce 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>
2012-08-06 09:48:31 -07:00
..
2012-05-22 15:50:46 -07:00
2012-06-25 16:20:41 -07:00
2012-07-18 09:40:53 -07:00
2012-05-22 15:50:46 -07:00
2012-07-16 22:38:28 -07:00