kernel-fxtec-pro1x/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
con3270.c
ctrlchar.c
ctrlchar.h
defkeymap.c
defkeymap.map
fs3270.c [S390] avoid default_llseek in s390 drivers 2010-05-17 10:00:16 +02:00
Kconfig
keyboard.c [S390] drivers/s390/char: Use kmemdup 2010-05-17 10:00:18 +02:00
keyboard.h
Makefile
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
raw3270.h
sclp.c
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
tape.h
tape_34xx.c
tape_3590.c
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
tape_class.c
tape_class.h
tape_core.c
tape_proc.c
tape_std.c
tape_std.h
tty3270.c
tty3270.h
vmcp.c
vmcp.h
vmlogrdr.c
vmur.c
vmur.h
vmwatchdog.c
zcore.c [S390] avoid default_llseek in s390 drivers 2010-05-17 10:00:16 +02:00