forked from Minki/linux
c8d1a12692
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> |
||
|---|---|---|
| .. | ||
| cx25821-alsa.c | ||
| cx25821-audio-upstream.c | ||
| cx25821-audio-upstream.h | ||
| cx25821-audio.h | ||
| cx25821-audups11.c | ||
| cx25821-biffuncs.h | ||
| cx25821-cards.c | ||
| cx25821-core.c | ||
| cx25821-gpio.c | ||
| cx25821-gpio.h | ||
| cx25821-i2c.c | ||
| cx25821-medusa-defines.h | ||
| cx25821-medusa-reg.h | ||
| cx25821-medusa-video.c | ||
| cx25821-medusa-video.h | ||
| cx25821-reg.h | ||
| cx25821-sram.h | ||
| cx25821-video0.c | ||
| cx25821-video1.c | ||
| cx25821-video2.c | ||
| cx25821-video3.c | ||
| cx25821-video4.c | ||
| cx25821-video5.c | ||
| cx25821-video6.c | ||
| cx25821-video7.c | ||
| cx25821-video-upstream-ch2.c | ||
| cx25821-video-upstream-ch2.h | ||
| cx25821-video-upstream.c | ||
| cx25821-video-upstream.h | ||
| cx25821-video.c | ||
| cx25821-video.h | ||
| cx25821-videoioctl.c | ||
| cx25821-vidups9.c | ||
| cx25821-vidups10.c | ||
| cx25821.h | ||
| Kconfig | ||
| Makefile | ||
| README | ||
Todo: - checkpatch.pl cleanups - sparse cleanups Please send patches to linux-media@vger.kernel.org