]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 02:38:37 +0000 (13:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 02:38:37 +0000 (13:38 +1100)
commit624e612cdf98fe140e2e56d10935d617c97f838e
tree9e516fea24619caf29bbb6fe87350ff263270160
parent59bfbe87cad319c489b25a07cc6b43e5a3392e11
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