Jens Axboe 7f03292ee1 Merge branch 'master' into for-2.6.34 ... Conflicts: include/linux/blkdev.h Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-02-25 08:48:05 +01:00
..
acpi	Merge branch 'bugzilla-14483' into release	2010-01-20 01:14:50 -05:00
asm-generic	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
crypto
drm	Merge remote branch 'nouveau/for-airlied' of nouveau-2.6	2010-02-11 12:10:52 +10:00
keys
linux	Merge branch 'master' into for-2.6.34	2010-02-25 08:48:05 +01:00
math-emu
media	V4L/DVB (13670): soc-camera: Add mt9t112 camera driver	2009-12-16 09:27:41 -02:00
mtd
net	netfilter: nf_conntrack: fix hash resizing with namespaces	2010-02-08 11:18:07 -08:00
pcmcia
rdma	Merge branches 'amso1100', 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'iser', 'misc', 'mlx4' and 'nes' into for-next	2009-12-15 23:39:25 -08:00
rxrpc
scsi	[SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.	2010-01-17 12:36:33 -06:00
sound
trace	tracing: Fix sign fields in ftrace_define_fields_##call()	2009-12-30 10:27:06 -05:00
video	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-16 10:29:52 -08:00
xen
Kbuild