]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'tty-3.3-rc3' tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:23:43 +0000 (10:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:25:27 +0000 (10:25 -0800)
This is needed to handle the 8250 file merge mess properly for future
patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serial/8250/8250.c
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile

Simple merge
Simple merge
Simple merge