Arnd Bergmann
f907ab06bb
Merge branch 'next/fixes-non-critical' into next/drivers
...
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 22:42:24 +00:00
..
hvc
tty: hvc_dcc: Fix duplicate character inputs
2011-11-15 12:02:13 -08:00
ipwireless
serial
Merge branch 'lpc32xx/drivers' into next/drivers
2012-02-22 14:20:18 +00:00
vt
drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
2012-02-02 16:11:23 -08:00
amiserial.c
bfin_jtag_comm.c
cyclades.c
ehv_bytechan.c
isicom.c
Kconfig
tty/powerpc: early udbg consoles can't be modules
2012-02-24 16:11:50 -08:00
Makefile
moxa.c
moxa.h
mxser.c
mxser.h
n_gsm.c
n_gsm: Fix timings
2011-11-08 10:10:20 -08:00
n_hdlc.c
tty: n_hdlc not atomic use tty->flags.
2011-11-30 21:30:49 +09:00
n_r3964.c
n_tracerouter.c
n_tracesink.c
n_tracesink.h
n_tty.c
drivers/tty: Remove unneeded spaces
2011-12-09 19:11:35 -08:00
nozomi.c
pty.c
TTY: pty, cleanup the pty counting
2011-11-17 11:42:09 -08:00
rocket.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
rocket.h
rocket_int.h
synclink.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
synclink_gt.c
synclinkmp.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
sysrq.c
fs: move code out of buffer.c
2012-01-03 22:54:07 -05:00
tty_audit.c
tty_buffer.c
tty_io.c
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-01-09 12:09:24 -08:00
tty_ioctl.c
tty_ldisc.c
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
2011-11-26 20:07:25 -08:00
tty_mutex.c
tty_port.c
TTY: fix UV serial console regression
2012-01-24 12:55:37 -08:00