Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] gspca - sonixj: Better handling of the bridge registers 0x01 and 0x17 [media] gspca - sonixj: Add the bit definitions of the bridge reg 0x01 and 0x17 [media] gspca - sonixj: Set the flag for some devices [media] gspca - sonixj: Add a flag in the driver_info table [media] gspca - sonixj: Fix a bad probe exchange [media] gspca - sonixj: Move bridge init to sd start [media] bttv: remove unneeded locking comments [media] bttv: fix mutex use before init (BZ#24602) [media] Don't export format_by_forcc on two different drivers
Showing
- drivers/media/common/saa7146_hlp.c 4 additions, 4 deletionsdrivers/media/common/saa7146_hlp.c
- drivers/media/common/saa7146_video.c 8 additions, 8 deletionsdrivers/media/common/saa7146_video.c
- drivers/media/video/bt8xx/bttv-driver.c 3 additions, 114 deletionsdrivers/media/video/bt8xx/bttv-driver.c
- drivers/media/video/gspca/sonixj.c 184 additions, 232 deletionsdrivers/media/video/gspca/sonixj.c
- drivers/staging/cx25821/cx25821-video.c 4 additions, 4 deletionsdrivers/staging/cx25821/cx25821-video.c
- drivers/staging/cx25821/cx25821-video.h 1 addition, 1 deletiondrivers/staging/cx25821/cx25821-video.h
- include/media/saa7146.h 1 addition, 1 deletioninclude/media/saa7146.h
Loading
Please register or sign in to comment