From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 21 May 2010 19:48:55 +0000 (-0700)
Subject: Merge staging-next tree into Linus's latest version
X-Git-Tag: v2.6.35-rc1~441^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8d1a126924fcbc1d61ceb830226e0c7afdcc841;p=pandora-kernel.git

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>
---

c8d1a126924fcbc1d61ceb830226e0c7afdcc841
Reading git-diff-tree failed