Tejun Heo e83a46bbb1 Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core ... This merge creates two set of conflicts. One is simple context conflicts caused by removal of throtl_scheduled_delayed_work() in for-linus and removal of throtl_shutdown_timer_wq() in for-2.6.39/core. The other is caused by commit 255bb490c8 (block: blk-flush shouldn't call directly into q->request_fn() __blk_run_queue()) in for-linus crashing with FLUSH reimplementation in for-2.6.39/core. The conflict isn't trivial but the resolution is straight-forward. * __blk_run_queue() calls in flush_end_io() and flush_data_end_io() should be called with @force_kblockd set to %true. * elv_insert() in blk_kick_flush() should use %ELEVATOR_INSERT_REQUEUE. Both changes are to avoid invoking ->request_fn() directly from request completion path and closely match the changes in the commit 255bb490c8. Signed-off-by: Tejun Heo <tj@kernel.org>		2011-03-04 19:09:02 +01:00
..
acpi	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-01-20 16:28:34 -08:00
asm-generic	mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>	2011-02-28 17:46:49 -08:00
crypto
drm	drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.	2011-02-28 15:24:35 +10:00
keys
linux	Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core	2011-03-04 19:09:02 +01:00
math-emu
media	[media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h	2011-01-19 11:52:09 -02:00
mtd
net	net_sched: long word align struct qdisc_skb_cb data	2011-02-23 14:17:02 -08:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
rdma	RDMA: Update workqueue usage	2011-01-16 21:16:31 -08:00
rxrpc
scsi	[SCSI] fix incorrect value of SCSI_MAX_SG_CHAIN_SEGMENTS due to include file ordering	2011-01-24 11:49:34 -06:00
sound	ASoC: WM8903: Fix mic detection register definitions	2011-02-13 19:38:06 +00:00
target	[SCSI] target: fix use after free detected by SLUB poison	2011-02-12 12:32:41 -06:00
trace	blktrace: Remove blk_fill_rwbs_rq.	2011-03-03 10:53:20 -05:00
video
xen	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
Kbuild