forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'origin'

Browse source 
Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab
This commit is contained in:
Linus Torvalds 2006-03-21 08:52:18 -08:00
commit b05005772f
2202 changed files with 52126 additions and 33011 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/dvb/video.h
View file

@ -135,7 +135,7 @@ typedef struct video_spu {
typedef struct video_spu_palette { /* SPU Palette information */
int length;
uint8_t *palette;
uint8_t __user *palette;
} video_spu_palette_t;