]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:36:24 +0000 (14:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:36:24 +0000 (14:36 +1100)
commit667df2f2bd29cbbcbe46793bfe20837018e0ce4d
treeed06a5c4fc16f5b40f1c9c50ef35fec93af298cb
parent6313d611e47d2f980bce8ba41130d6d79182f88d
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