249f3c4fe4
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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ircomm_core.c | ||
ircomm_event.c | ||
ircomm_lmp.c | ||
ircomm_param.c | ||
ircomm_ttp.c | ||
ircomm_tty.c | ||
ircomm_tty_attach.c | ||
ircomm_tty_ioctl.c |