We want the fixes in here, and this resolves a merge error in tty_io.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
block.c | ||
Kconfig | ||
Makefile | ||
mmc_test.c | ||
queue.c | ||
queue.h | ||
sdio_uart.c |
We want the fixes in here, and this resolves a merge error in tty_io.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
block.c | ||
Kconfig | ||
Makefile | ||
mmc_test.c | ||
queue.c | ||
queue.h | ||
sdio_uart.c |