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: cb5f0c2 0c57dfc)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 27 Sep 2012 05:10:47 +0000 (15:10 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 27 Sep 2012 05:10:47 +0000 (15:10 +1000)
commit	121d2abbee7b4aca748aeab3ea79804006211622
tree	ecae6d0048f3a03f55a831c194d2ec6d0bd73da6	tree \| snapshot
parent	cb5f0c2ce3cc94eb366803a7fb51156c9ada342d	commit \| diff
parent	0c57dfcc6c1d037243c2f8fbf62eab3633326ec0	commit \| diff

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

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

14 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/kgdboc.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
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules