linux/drivers/staging/cx25821
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
..
cx25821-alsa.c V4L/DVB: cx25821: fix coding style issues in cx25821-alsa.c 2010-05-19 12:58:34 -03:00
cx25821-audio-upstream.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
cx25821-audio-upstream.h
cx25821-audio.h
cx25821-audups11.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-biffuncs.h
cx25821-cards.c V4L/DVB: staging:cx2581: fixes coding style issues in cx25821-cards.c 2010-05-19 12:58:35 -03:00
cx25821-core.c V4L/DVB: cx25821: prepend cx25821_ to video exported symbols 2010-05-18 00:51:17 -03:00
cx25821-gpio.c V4L/DVB: cx25821: fix coding style issues in cx25821-gpio.c 2010-05-18 00:51:14 -03:00
cx25821-gpio.h
cx25821-i2c.c V4L/DVB: staging:cx25821:fixes coding styles in cx25821-i2c.c 2010-05-19 12:58:36 -03:00
cx25821-medusa-defines.h
cx25821-medusa-reg.h
cx25821-medusa-video.c V4L/DVB: Fix unlock logic at medusa_video_init 2010-05-19 12:59:16 -03:00
cx25821-medusa-video.h
cx25821-reg.h
cx25821-sram.h
cx25821-video0.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video1.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video2.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video3.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video4.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video5.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video6.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video7.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video-upstream-ch2.c Staging: Drop memory allocation cast 2010-05-11 16:06:48 -07:00
cx25821-video-upstream-ch2.h
cx25821-video-upstream.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
cx25821-video-upstream.h
cx25821-video.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-video.h V4L/DVB: cx25821: prepend cx25821_ to video exported symbols 2010-05-18 00:51:17 -03:00
cx25821-videoioctl.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-vidups9.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821-vidups10.c V4L/DVB: v4l2-common: simplify prio utility functions 2010-05-19 12:58:54 -03:00
cx25821.h
Kconfig
Makefile
README

Todo:
	- checkpatch.pl cleanups
	- sparse cleanups

Please send patches to linux-media@vger.kernel.org