Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version ... Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-05-21 12:48:55 -07:00
..
acpi	ACPICA: Update version to 20100428.	2010-05-06 03:05:54 -04:00
asm-generic	Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-18 09:17:01 -07:00
crypto
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-05-07 14:02:01 -07:00
keys
linux	Merge staging-next tree into Linus's latest version	2010-05-21 12:48:55 -07:00
math-emu
media	V4L/DVB: v4l2-subdev.h: Add support for enum_dv_preset	2010-05-19 12:59:01 -03:00
mtd
net	ipv6: Replace inet6_ifaddr->dead with state	2010-05-18 15:36:06 -07:00
pcmcia	pcmcia: remove unused mem_op.h	2010-05-10 10:23:20 +02:00
rdma	IB/core: Add support for masked atomic operations	2010-04-21 16:37:48 -07:00
rxrpc
scsi	[SCSI] libfc: Move the port_id into lport	2010-05-16 22:22:34 -04:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-05-21 07:19:18 -07:00
video
xen	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kbuild