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
..
cdc-acm.c	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
cdc-acm.h
cdc-wdm.c	Merge 3.5-rc7 into usb-next	2012-07-16 13:16:09 -07:00
Kconfig
Makefile
usblp.c
usbtmc.c