Jens Axboe 4c63f5646e Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core ... Conflicts: block/blk-core.c block/blk-flush.c drivers/md/raid1.c drivers/md/raid10.c drivers/md/raid5.c fs/nilfs2/btnode.c fs/nilfs2/mdt.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-03-10 08:58:35 +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	crypto: padlock - Move padlock.h into include/crypto	2011-01-07 14:52:00 +11:00
drm	drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.	2011-02-28 15:24:35 +10:00
keys	keys: add new key-type encrypted	2010-11-29 08:55:29 +11:00
linux	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +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	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
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	…