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
..
ircomm	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
irlan	irda: Fix typo in irda	2012-07-16 23:23:52 -07:00
irnet	ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>	2012-03-04 20:41:38 -05:00
af_irda.c	irda: Fix typo in irda	2012-07-16 23:23:52 -07:00
discovery.c
irda_device.c
iriap_event.c
iriap.c
irias_object.c
irlap_event.c
irlap_frame.c
irlap.c
irlmp_event.c
irlmp_frame.c
irlmp.c
irmod.c
irnetlink.c
irproc.c
irqueue.c	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
irsysctl.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
irttp.c
Kconfig
Makefile
parameters.c
qos.c
timer.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
wrapper.c