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
..
asyncdata.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
bas-gigaset.c	USB 3.5-rc1 pull request	2012-05-22 15:50:46 -07:00
capi.c	gigaset: silence GCC warning for unused 'format_ie'	2012-07-16 23:23:53 -07:00
common.c	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
dummyll.c	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
ev-layer.c	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
gigaset.h	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
i4l.c	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
interface.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
isocdata.c	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
Kconfig	isdn/gigaset: remove EXPERIMENTAL tag from GIGASET_CAPI	2010-07-07 16:57:56 -07:00
Makefile	gigaset: add Kernel CAPI interface (v3)	2009-10-06 22:43:53 -07:00
proc.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
ser-gigaset.c	isdn/gigaset: unify function return values	2012-05-07 22:37:56 -04:00
usb-gigaset.c	USB 3.5-rc1 pull request	2012-05-22 15:50:46 -07:00