becba85f0e
This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
braille.c | ||
braille.h | ||
console_cmdline.h | ||
Makefile | ||
printk.c |
becba85f0e
This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
braille.c | ||
braille.h | ||
console_cmdline.h | ||
Makefile | ||
printk.c |