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
..
events	Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block	2010-08-10 15:22:42 -07:00
define_trace.h	tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header	2010-05-05 11:46:17 -04:00
ftrace.h	tracing: Drop cpparg() macro	2010-08-02 01:31:28 +02:00
syscall.h	tracing: Use a global field list for all syscall exit events	2010-06-28 17:12:44 -04:00