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

..

act2000

isdn: whitespace coding style cleanup

2012-02-21 09:04:01 -08:00

capi

isdn/capi: elliminate capincci_find() in non-middleware case

2012-05-07 22:37:57 -04:00

divert

isdn: whitespace coding style cleanup

2012-02-21 09:04:01 -08:00

gigaset

Merge tty-next into 3.6-rc1

2012-08-06 09:48:31 -07:00

hardware

mISDN: Bugfix only few bytes are transfered on a connection

2012-07-29 23:18:30 -07:00

hisax

ISDN: Add check for usb_alloc_urb() result

2012-07-18 09:40:54 -07:00

hysdn

isdn/hysdn: Convert to kstrtoul_from_user

2012-04-15 03:23:31 -04:00

i4l

tty: move the termios object into the tty

2012-07-16 13:00:41 -07:00

icn

isdn: whitespace coding style cleanup

2012-02-21 09:04:01 -08:00

isdnloop

isdn: whitespace coding style cleanup

2012-02-21 09:04:01 -08:00

mISDN

drivers/isdn/mISDN/stack.c: remove invalid reference to list iterator variable

2012-07-09 15:24:33 -07:00

pcbit

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

sc

isdn: whitespace coding style cleanup

2012-02-21 09:04:01 -08:00

Kconfig

um: switch to use of drivers/Kconfig

2011-11-02 14:15:41 +01:00

Makefile

mISDN fix main ISDN Makefile

2008-08-02 16:28:20 +02:00