]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 03:59:42 +0000 (14:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 03:59:42 +0000 (14:59 +1100)
commit0a978bf0826d59fba996364945c1a05e0745571f
tree3ec7ea3bc277d2741c07f34299c2faa8e14a570d
parent7bdd8185110116472fbabba9d0e4fae9b36ea308
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