10af77c193
This resolves the merge problem with: drivers/tty/serial/pch_uart.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
block | ||
char | ||
cio | ||
crypto | ||
kvm | ||
net | ||
scsi | ||
Makefile |