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	[S390] 3215/3270 console: remove wrong comment	2009-12-07 12:51:39 +01:00
ctrlchar.c
ctrlchar.h
defkeymap.c	Build fix for drivers/s390/char/defkeymap.c	2008-03-04 08:01:26 -08:00
defkeymap.map
fs3270.c	[S390] fs3270: add missing compat ptr conversion	2010-01-13 20:44:45 +01:00
Kconfig	[S390] add call home support	2009-09-11 10:29:49 +02:00
keyboard.c
keyboard.h
Makefile	[S390] add call home support	2009-09-11 10:29:49 +02:00
monreader.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
monwriter.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
raw3270.c	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
raw3270.h	[S390] pm: con3270 power management callbacks.	2009-06-16 10:31:20 +02:00
sclp_async.c	sysctl s390: Remove dead sysctl binary support	2009-11-12 02:05:01 -08:00
sclp_cmd.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
sclp_con.c	[S390] Use del_timer instead of del_timer_sync	2009-06-22 12:08:19 +02:00
sclp_config.c	[S390] convert sclp printks to pr_xxx macros.	2008-12-25 13:39:24 +01:00
sclp_cpi_sys.c	[S390] convert sclp printks to pr_xxx macros.	2008-12-25 13:39:24 +01:00
sclp_cpi_sys.h
sclp_cpi.c
sclp_quiesce.c	[S390] sclp: undo quiesce handler override on resume	2009-11-13 15:45:03 +01:00
sclp_rw.c	[S390] pm: power management support for SCLP drivers.	2009-06-16 10:31:16 +02:00
sclp_rw.h	[S390] sclp: fix compile error for !SCLP_CONSOLE	2009-07-07 16:37:50 +02:00
sclp_sdias.c	[S390] convert sclp printks to pr_xxx macros.	2008-12-25 13:39:24 +01:00
sclp_tty.c	[S390] sclp_tty: Fix scheduling while atomic bug.	2008-07-14 10:02:25 +02:00
sclp_tty.h	[S390] sclp_tty: remove ioctl interface.	2008-07-14 10:02:25 +02:00
sclp_vt220.c	[S390] sclp_vt220: set initial terminal window size	2010-01-27 10:12:49 +01:00
sclp.c	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
sclp.h	[S390] add call home support	2009-09-11 10:29:49 +02:00
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	[S390] tape: duplicate sysfs filename when setting tape device online	2008-04-17 07:46:59 +02:00
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
tape.h	[S390] tape: remove BKL from tape driver	2009-12-07 12:51:36 +01:00
tty3270.c	[S390] tty3270: move keyboard compat ioctls	2009-12-07 12:51:38 +01:00
tty3270.h
vmcp.c	[S390] vmcp: add missing compat ptr conversion	2010-01-13 20:44:44 +01:00
vmcp.h
vmlogrdr.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
vmur.c	[S390] vmur: remove BKL	2009-12-07 12:51:39 +01:00
vmur.h	[S390] vmur: Use wait queue instead of mutex to serialize open	2008-04-17 07:46:59 +02:00
vmwatchdog.c	[S390] vmwatchdog: remove lock_kernel() from open() function	2009-12-07 12:51:38 +01:00
zcore.c	[S390] zcore: Add prefix registers to dump header	2010-02-26 22:37:33 +01:00