linux/drivers/s390/char
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
Kconfig [S390] cleanup s390 Kconfig 2011-01-05 12:47:23 +01:00
Makefile
con3215.c [S390] 3215: add support for irq statistics 2011-01-05 12:47:25 +01:00
con3270.c
ctrlchar.c
ctrlchar.h
defkeymap.c
defkeymap.map
fs3270.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
keyboard.c Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-03-16 15:11:04 -07:00
keyboard.h tty: phase out of ioctl file pointer for tty3270 as well 2011-02-25 09:56:13 -08:00
monreader.c
monwriter.c
raw3270.c [S390] 3270: add support for irq statistics 2011-01-05 12:47:25 +01:00
raw3270.h
sclp.c [S390] sclp: use register_external_interrupt() 2011-01-05 12:47:26 +01:00
sclp.h
sclp_async.c
sclp_cmd.c
sclp_con.c
sclp_config.c [S390] prevent unneccesary loops_per_jiffy recalculation 2011-01-05 12:47:32 +01:00
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 [S390] tape: deadlock on system work queue 2011-03-03 17:56:14 +01:00
tape_34xx.c [S390] tape: deadlock on system work queue 2011-03-03 17:56:14 +01:00
tape_3590.c [S390] tape: deadlock on system work queue 2011-03-03 17:56:14 +01:00
tape_3590.h
tape_block.c Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core 2011-03-10 08:58:35 +01:00
tape_char.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
tape_class.c
tape_class.h headers: kobject.h redux 2011-01-10 08:51:44 -08:00
tape_core.c [S390] tape: add support for irq statistics 2011-01-05 12:47:25 +01:00
tape_proc.c
tape_std.c
tape_std.h
tty3270.c tty: phase out of ioctl file pointer for tty3270 as well 2011-02-25 09:56:13 -08:00
tty3270.h
vmcp.c
vmcp.h
vmlogrdr.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
vmur.c [S390] vmur: add support for irq statistics 2011-01-05 12:47:26 +01:00
vmur.h
vmwatchdog.c
zcore.c