projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 161e773 caca6a0)
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)
commitdd7c7c3f69291baa488b8a50db683d5fbf44166a
tree925bf294f30dffaa67a983c3859926ff53937e14tree | snapshot
parent161e773cbd0c3d1b5b8cc00602e1f72de61ed4f7commit | diff
parentcaca6a03d365883564885f2c1da3e88dcf65d139commit | diff
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 diff1 | diff2 | blob | history
drivers/tty/serial/Kconfig diff1 | diff2 | blob | history
drivers/tty/serial/atmel_serial.c diff1 | diff2 | blob | history
drivers/tty/serial/mfd.c diff1 | diff2 | blob | history
drivers/tty/serial/pch_uart.c diff1 | diff2 | blob | history
drivers/tty/tty_ldisc.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git