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
..
ioc3-eth.c	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
Kconfig	MII: fix Kconfig dependencies for MII	2011-09-15 15:49:08 -04:00
Makefile
meth.c	net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery	2011-12-27 13:17:34 -05:00
meth.h