]> 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, 13 Nov 2012 03:15:21 +0000 (14:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 03:15:21 +0000 (14:15 +1100)
commit4df317652cd57478bf63f3509f300f8ed5b0ba22
tree1e63081619029cd343b9d35b82ad330a55f7c26f
parent6780e04ee12459df44fb1e0655e2759d08189506
parent76cc43868c1e9d6344ad6c4992c4f6abd5204a8f
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/omap-serial.c
arch/x86/platform/ce4100/ce4100.c
drivers/tty/serial/omap-serial.c
drivers/tty/serial/serial_core.c