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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0504338 4dac211)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 04:23:13 +0000 (14:23 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 04:23:13 +0000 (14:23 +1000)
commit	df1037db56f34a91477025c10e421a626c4400ce
tree	e257d29437a437664740702f0dd3d0ce034496d2	tree \| snapshot
parent	050433804b4b140a14b7ff537b181a4b12fac75c	commit \| diff
parent	4dac2116547b4aab7ac327edb344bb68ed1e8839	commit \| diff

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

Conflicts:
drivers/tty/serial/omap-serial.c

12 files changed:

arch/xtensa/platforms/iss/console.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/hvc/hvc_console.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/hvc/hvsi.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/ipwireless/network.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/omap-serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/tty_io.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/tty_ldisc.c	diff1 \|	diff2 \|	blob \| history
firmware/Makefile	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules