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
..
block.c	mmc: block: replace __blk_end_request() with blk_end_request()	2012-07-10 23:04:05 -04:00
Kconfig	mmc: Improve MMC_TEST config text.	2011-03-15 13:48:56 -04:00
Makefile	mmc: Makefile: Fix EXTRA_CFLAGS assignment	2010-10-23 21:11:15 +08:00
mmc_test.c	MMC highlights for 3.3:	2012-01-13 20:41:15 -08:00
queue.c	mmc: queue: remove redundant memsets	2012-05-09 10:10:46 -04:00
queue.h	mmc: block: add handling for two parallel block requests in issue_rw_rq	2011-07-20 17:21:15 -04:00
sdio_uart.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00