git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Oct 2011 05:36:44 +0000 (16:36 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Oct 2011 05:36:44 +0000 (16:36 +1100)
commit	b5fa50b2034da3729ae16c2e2a1980899adbe2ae
tree	0c8e01afb9d2d09f9f4dd3b978660fabb2a0ba3d	tree \| snapshot
parent	ad3b0015b96d1ff7884bd492ea1e7feae85fea9f	commit \| diff
parent	53d785ccd918d571c227d459477793872676fc02	commit \| diff

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c

25 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s5p/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/udbg.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/udbg.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/mrst/mrst.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/hvc/hvcs.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/atmel_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/lantiq.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/max3107.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/mrst_max3110.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/msm_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/pch_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/samsung.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sh-sci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/ucc_uart.c	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s5p/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/udbg.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/udbg.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/mrst/mrst.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/hvc/hvcs.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/atmel_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/lantiq.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/max3107.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/mrst_max3110.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/msm_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/pch_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/samsung.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sh-sci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/ucc_uart.c	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history