2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
linux-next/drivers/s390/char
Linus Torvalds 2f9e825d3e Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits)
  block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
  xen-blkfront: fix missing out label
  blkdev: fix blkdev_issue_zeroout return value
  block: update request stacking methods to support discards
  block: fix missing export of blk_types.h
  writeback: fix bad _bh spinlock nesting
  drbd: revert "delay probes", feature is being re-implemented differently
  drbd: Initialize all members of sync_conf to their defaults [Bugz 315]
  drbd: Disable delay probes for the upcomming release
  writeback: cleanup bdi_register
  writeback: add new tracepoints
  writeback: remove unnecessary init_timer call
  writeback: optimize periodic bdi thread wakeups
  writeback: prevent unnecessary bdi threads wakeups
  writeback: move bdi threads exiting logic to the forker thread
  writeback: restructure bdi forker loop a little
  writeback: move last_active to bdi
  writeback: do not remove bdi from bdi_list
  writeback: simplify bdi code a little
  writeback: do not lose wake-ups in bdi threads
  ...

Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and
drivers/scsi/scsi_error.c as per Jens.
2010-08-10 15:22:42 -07:00
..
con3215.c [S390] con3215: remove empty ioctl function 2010-01-13 20:44:46 +01:00
con3270.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
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] avoid default_llseek in s390 drivers 2010-05-17 10:00:16 +02:00
Kconfig [S390] vmcp: disallow modular build 2010-05-17 10:00:15 +02:00
keyboard.c [S390] drivers/s390/char: Use kmemdup 2010-05-17 10:00:18 +02:00
keyboard.h unicode diacritics support 2007-10-17 08:42:52 -07:00
Makefile [S390] add call home support 2009-09-11 10:29:49 +02:00
monreader.c s390: remove WARN_ON for misc_deregister() failures 2010-08-09 20:45:06 -07:00
monwriter.c s390: remove WARN_ON for misc_deregister() failures 2010-08-09 20:45:06 -07: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 [S390] sclp_async: potential buffer overflow 2010-04-09 13:43:02 +02:00
sclp_cmd.c [S390] sclp: avoid 64 bit division 2010-03-24 11:49:53 +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] convert sclp printks to pr_xxx macros. 2008-12-25 13:39:24 +01:00
sclp_cpi_sys.c Fix typos in comments 2010-03-16 11:47:56 +01:00
sclp_cpi_sys.h [S390] sclp: sysfs interface for SCLP cpi 2008-01-26 14:11:08 +01:00
sclp_cpi.c [S390] sclp: sysfs interface for SCLP cpi 2008-01-26 14:11:08 +01:00
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 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_tty.h [S390] sclp_tty: remove ioctl interface. 2008-07-14 10:02:25 +02:00
sclp_vt220.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.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 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
tape_3590.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
tape_3590.h
tape_block.c block: push down BKL into .open and .release 2010-08-07 18:25:34 +02:00
tape_char.c [S390] tape_char: add missing compat_ptr conversion 2010-01-13 20:44:46 +01:00
tape_class.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
tape_class.h [S390] tape: duplicate sysfs filename when setting tape device online 2008-04-17 07:46:59 +02:00
tape_core.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
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 [S390] Get rid of a bunch of sparse warnings again. 2007-10-12 16:13:06 +02:00
vmcp.c [S390] vmcp: disallow modular build 2010-05-17 10:00:15 +02:00
vmcp.h
vmlogrdr.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
vmur.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
vmur.h [S390] vmur: Use wait queue instead of mutex to serialize open 2008-04-17 07:46:59 +02:00
vmwatchdog.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
zcore.c [S390] avoid default_llseek in s390 drivers 2010-05-17 10:00:16 +02:00