]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:39:28 +0000 (13:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:39:28 +0000 (13:39 +1100)
commit16b688d001d76f5a7ee00498abc59036cc6ea73e
treec09996fd9c4b4e5357460f0ebc9b673130c427d8
parentcf6528232283db50daa0f26e930564f4977475e8
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