e4c5bf8e3d
This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| cx25821-alsa.c | ||
| cx25821-audio-upstream.c | ||
| cx25821-audio-upstream.h | ||
| cx25821-audio.h | ||
| 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-video-upstream-ch2.c | ||
| cx25821-video-upstream-ch2.h | ||
| cx25821-video-upstream.c | ||
| cx25821-video-upstream.h | ||
| cx25821-video.c | ||
| cx25821-video.h | ||
| cx25821.h | ||
| Kconfig | ||
| Makefile | ||
| README | ||
Todo: - checkpatch.pl cleanups - sparse cleanups Please send patches to linux-media@vger.kernel.org