kernel-hacking-2024-linux-s.../drivers/s390/char
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
con3215.c [S390] con3215: remove empty ioctl function 2010-01-13 20:44:46 +01:00
con3270.c
ctrlchar.c
ctrlchar.h
defkeymap.c
defkeymap.map
fs3270.c [S390] fs3270: add missing compat ptr conversion 2010-01-13 20:44:45 +01:00
Kconfig
keyboard.c
keyboard.h
Makefile
monreader.c
monwriter.c
raw3270.c tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
raw3270.h
sclp.c tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
sclp.h
sclp_async.c
sclp_cmd.c
sclp_con.c
sclp_config.c
sclp_cpi.c
sclp_cpi_sys.c
sclp_cpi_sys.h
sclp_quiesce.c
sclp_rw.c
sclp_rw.h
sclp_sdias.c
sclp_tty.c
sclp_tty.h
sclp_vt220.c [S390] sclp_vt220: set initial terminal window size 2010-01-27 10:12:49 +01:00
tape.h
tape_34xx.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_3590.c [S390] Use strim instead of strstrip to avoid false warnings. 2009-12-18 17:43:33 +01:00
tape_3590.h
tape_block.c block: Consolidate phys_segment and hw_segment limits 2010-02-26 13:58:08 +01:00
tape_char.c [S390] tape_char: add missing compat_ptr conversion 2010-01-13 20:44:46 +01:00
tape_class.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_class.h
tape_core.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_proc.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_std.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_std.h
tty3270.c
tty3270.h
vmcp.c [S390] vmcp: add missing compat ptr conversion 2010-01-13 20:44:44 +01:00
vmcp.h
vmlogrdr.c
vmur.c
vmur.h
vmwatchdog.c
zcore.c [S390] zcore: Add prefix registers to dump header 2010-02-26 22:37:33 +01:00