]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:53:16 +0000 (13:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:53:16 +0000 (13:53 +1100)
commit0ab86aa708357ce635651f73fe4c88fd5ffb3adc
tree437782e62b92af71ed31e4dffac36ca1b11c3a51
parentdbfd002c8352ac08d83132cd324c24f4d3089030
parentbb74041b1367b4935b8284a2b541f5e4365d3f50
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/serial/pch_uart.c
include/linux/serial_core.h