1
0
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 04:11:49 +00:00
linux/drivers/xen/xenbus
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
..
Makefile
xenbus_client.c xenbus: Make xenbus_switch_state transactional 2010-08-07 18:31:34 +02:00
xenbus_comms.c xenbus: rebind irq on restore 2008-05-27 10:11:38 +02:00
xenbus_comms.h
xenbus_probe.c Merge branch 'upstream/pvhvm' into upstream/xen 2010-08-04 14:49:16 -07:00
xenbus_probe.h xen: struct device - replace bus_id with dev_name(), dev_set_name() 2009-01-06 10:44:34 -08:00
xenbus_xs.c Merge branch 'xen/xenbus' into upstream/xen 2010-08-04 14:49:24 -07:00