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> |
||
|---|---|---|
| .. | ||
| ircomm | ||
| irlan | ||
| irnet | ||
| Kconfig | ||
| Makefile | ||
| af_irda.c | ||
| discovery.c | ||
| irda_device.c | ||
| iriap.c | ||
| iriap_event.c | ||
| irias_object.c | ||
| irlap.c | ||
| irlap_event.c | ||
| irlap_frame.c | ||
| irlmp.c | ||
| irlmp_event.c | ||
| irlmp_frame.c | ||
| irmod.c | ||
| irnetlink.c | ||
| irproc.c | ||
| irqueue.c | ||
| irsysctl.c | ||
| irttp.c | ||
| parameters.c | ||
| qos.c | ||
| timer.c | ||
| wrapper.c | ||