]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:32:35 +0000 (15:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:32:35 +0000 (15:32 +1100)
commit45b3160df7493d62108fc135a492b7a3aff08a6a
tree944e23fce8186ed33d4cbc8e83a3cad32be19bad
parent6801d6523358ccda0280ebf47764ed828b74195a
parent9e17df37d710f8998e9cb10a548304fe33d4a5c2
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/i2c/busses/Kconfig
drivers/lguest/Kconfig
drivers/net/can/Kconfig
drivers/net/wan/Kconfig
29 files changed:
arch/alpha/Kconfig
arch/mips/sni/a20r.c
arch/parisc/Kconfig
arch/tile/Kconfig
arch/xtensa/Kconfig
drivers/i2c/busses/Kconfig
drivers/input/serio/Kconfig
drivers/isdn/gigaset/interface.c
drivers/lguest/Kconfig
drivers/misc/Kconfig
drivers/net/caif/Kconfig
drivers/net/can/Kconfig
drivers/net/irda/Kconfig
drivers/net/ppp/Kconfig
drivers/net/usb/Kconfig
drivers/net/usb/hso.c
drivers/net/wan/Kconfig
drivers/s390/char/tty3270.c
drivers/tty/serial/Kconfig
drivers/tty/serial/max3100.c
drivers/tty/serial/sccnxp.c
drivers/tty/tty_io.c
drivers/tty/vt/vt.c
drivers/usb/serial/ftdi_sio.c
include/linux/console.h
include/linux/pci_ids.h
include/linux/proc_fs.h
lib/Kconfig.kgdb
sound/soc/codecs/Kconfig