Greg Kroah-Hartman 9f9cba810f Merge 3.8-rc5 into tty-next ...

This resolves a number of tty driver merge issues found in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2013-01-25 13:27:36 -08:00

..

con3215.c

Merge 3.8-rc5 into tty-next

2013-01-25 13:27:36 -08:00

con3270.c

s390/3270: drop unused spinlock from struct con3270

2012-09-26 15:45:11 +02:00

ctrlchar.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

ctrlchar.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

defkeymap.c

…

defkeymap.map

…

fs3270.c

compat: fix compile breakage on s390

2012-02-27 07:54:27 -08:00

Kconfig

tty: Added a CONFIG_TTY option to allow removal of TTY

2013-01-18 16:15:27 -08:00

keyboard.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

keyboard.h

TTY: switch tty_schedule_flip

2013-01-15 22:43:15 -08:00

Makefile

[S390] get CPC image name

2011-05-23 10:24:32 +02:00

monreader.c

drivers/s390/char/monreader.c: fix error return code

2012-09-26 15:45:26 +02:00

monwriter.c

[S390] monwriter: fix return code handling

2011-05-23 10:24:29 +02:00

raw3270.c

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

raw3270.h

…

sclp_async.c

[S390] sclp_async: Use kstrtoul_from_user

2011-08-03 16:44:20 +02:00

sclp_cmd.c

s390/pci: PCI hotplug support via SCLP

2012-11-30 17:47:25 +01:00

sclp_con.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sclp_config.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_cpi_sys.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_cpi_sys.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_cpi.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_ocf.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_quiesce.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_rw.c

s390/sclp: use -EOPNOTSUPP instead of -ENOSYS

2012-09-26 15:45:13 +02:00

sclp_rw.h

…

sclp_sdias.c

s390/sclp_sdias: Add missing break and "fall through"

2012-08-08 07:32:55 -07:00

sclp_tty.c

TTY: switch tty_flip_buffer_push

2013-01-15 22:30:15 -08:00

sclp_tty.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

sclp_vt220.c

TTY: switch tty_flip_buffer_push

2013-01-15 22:30:15 -08:00

sclp.c

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

sclp.h

s390/pci: PCI hotplug support via SCLP

2012-11-30 17:47:25 +01:00

tape_34xx.c

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

tape_3590.c

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

tape_3590.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_char.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_class.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_class.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_core.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_proc.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_std.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

tape_std.h

s390/tape: remove even more tape block leftovers

2012-09-26 15:45:20 +02:00

tape.h

s390/tape: remove even more tape block leftovers

2012-09-26 15:45:20 +02:00

tty3270.c

TTY: move low_latency to tty_port

2013-01-15 22:23:16 -08:00

tty3270.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

vmcp.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

vmcp.h

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

vmlogrdr.c

s390/vmlogrdr: change return value from -ENOSYS to -EOPNOTSUPP

2012-09-26 15:45:16 +02:00

vmur.c

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

vmur.h

…

vmwatchdog.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00

zcore.c

s390/comments: unify copyright messages and remove file names

2012-07-20 11:15:04 +02:00