]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
authorGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 04:07:25 +0000 (20:07 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 04:07:25 +0000 (20:07 -0800)
commitb0e60f0dc4c94d02cd2bc421bb365293cfb86934
tree925bf294f30dffaa67a983c3859926ff53937e14
parent0471ad2e0f9368d7545453987cb9fd3651c709aa
parent6356dbc182c2e553460762d2b3443987bd1cec87
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/include/asm/mrst.h
drivers/tty/serial/Kconfig
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/mfd.c
drivers/tty/serial/pch_uart.c
drivers/tty/tty_ldisc.c