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
..
core.c	Bluetooth: Remove unnecessary headers include	2012-06-05 06:34:08 +03:00
Kconfig	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
Makefile
sock.c	Bluetooth: Remove unnecessary headers include	2012-06-05 06:34:08 +03:00
tty.c	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00