kernel_optimize_test/drivers/media/video
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
au0828
bt8xx Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-08-13 10:44:24 -07:00
cpia2
cx18 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
cx88 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
cx231xx V4L/DVB: cx231xx: Avoid an OOPS when card is unknown (card=0) 2010-09-27 22:22:00 -03:00
cx23885 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
cx25840 V4L/DVB: cx25840: Fix typo in volume control initialization: 65335 vs. 65535 2010-09-27 22:22:10 -03:00
davinci
em28xx Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-08-13 10:44:24 -07:00
et61x251
gspca V4L/DVB: gspca - sn9c20x: Bad transfer size of Bayer images 2010-09-27 22:22:01 -03:00
hdpvr
ivtv Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
omap
pvrusb2 V4L/DVB: pvrusb2: remove unneeded NULL checks 2010-09-27 22:21:48 -03:00
pwc
s5p-fimc V4L/DVB: v4l: s5p-fimc: Fix 3-planar formats handling and pixel offset error on S5PV210 SoCs 2010-09-27 22:39:16 -03:00
saa7134 V4L/DVB: Fix regression for BeholdTV Columbus 2010-09-27 22:21:50 -03:00
saa7164 V4L/DVB: saa7164: move dereference under NULL check 2010-09-27 22:21:49 -03:00
sn9c102 Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
tlg2300 V4L/DVB: fix Kconfig to depends on VIDEO_IR 2010-08-12 15:07:57 -03:00
usbvideo
usbvision
uvc V4L/DVB: uvcvideo: Restrict frame rates for Chicony CNF7129 webcam 2010-09-27 22:22:13 -03:00
zoran Fix various typos of valid in comments 2010-09-21 17:04:50 +02:00
adv7170.c
adv7175.c
adv7180.c
adv7343_regs.h
adv7343.c
ak881x.c
arv.c
bt819.c
bt856.c
bt866.c
btcx-risc.c
btcx-risc.h
bw-qcam.c
c-qcam.c
cafe_ccic-regs.h
cafe_ccic.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
cpia_pp.c
cpia_usb.c
cpia.c
cpia.h
cs53l32a.c
cs5345.c
cs8420.h
cx2341x.c
dabusb.c dabusb: remove the BKL 2010-10-19 11:30:00 +02:00
dabusb.h
fsl-viu.c
hexium_gemini.c
hexium_orion.c
ibmmpeg2.h
indycam.c
indycam.h
ir-kbd-i2c.c
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
ks0127.c
ks0127.h
m52790.c
Makefile
mem2mem_testdev.c V4L/DVB: v4l: mem2mem_testdev: add missing release for video_device 2010-09-27 22:22:09 -03:00
meye.c
meye.h
msp3400-driver.c
msp3400-driver.h
msp3400-kthreads.c
mt9m001.c
mt9m111.c V4L/DVB: mt9m111: added current colorspace at g_fmt 2010-09-27 22:22:06 -03:00
mt9t031.c
mt9t112.c
mt9v011.c
mt9v011.h
mt9v022.c V4L/DVB: mt9v022.c: Fixed compilation warning 2010-09-27 22:22:07 -03:00
mx1_camera.c
mx2_camera.c V4L/DVB: mx2_camera: fix a race causing NULL dereference 2010-09-27 22:22:03 -03:00
mx3_camera.c
mxb.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
mxb.h
omap24xxcam-dma.c
omap24xxcam.c
omap24xxcam.h
ov772x.c
ov7670.c
ov9640.c
ov9640.h
pms.c
pxa_camera.c
rj54n1cb0c.c
s2255drv.c
saa711x_regs.h
saa717x.c
saa5246a.c
saa5249.c
saa6588.c
saa7110.c
saa7115.c
saa7121.h
saa7127.c
saa7146.h
saa7146reg.h
saa7185.c
saa7191.c
saa7191.h
se401.c
se401.h
sh_mobile_ceu_camera.c
sh_mobile_csi2.c
sh_vou.c
soc_camera_platform.c
soc_camera.c
soc_mediabus.c
stk-sensor.c
stk-webcam.c
stk-webcam.h
stradis.c
tcm825x.c
tcm825x.h
tda7432.c
tda9840.c
tda9875.c
tea6415c.c
tea6415c.h
tea6420.c
tea6420.h
ths7303.c
tlv320aic23b.c
tuner-core.c
tvaudio.c
tveeprom.c
tvp514x_regs.h
tvp514x.c
tvp5150_reg.h
tvp5150.c
tvp7002_reg.h
tvp7002.c
tw9910.c
upd64031a.c
upd64083.c
v4l1-compat.c
v4l2-common.c
v4l2-compat-ioctl32.c v4l1: fix 32-bit compat microcode loading translation 2010-10-15 11:12:38 -07:00
v4l2-ctrls.c V4L/DVB: v4l2-ctrls.c: needs to include slab.h 2010-08-12 15:08:05 -03:00
v4l2-dev.c
v4l2-device.c
v4l2-event.c
v4l2-fh.c
v4l2-int-device.c
v4l2-ioctl.c
v4l2-mem2mem.c
videobuf-core.c
videobuf-dma-contig.c V4L/DVB: v4l: videobuf: prevent passing a NULL to dma_free_coherent() 2010-09-30 07:22:22 -03:00
videobuf-dma-sg.c V4L/DVB: videobuf-dma-sg: set correct size in last sg element 2010-09-27 22:22:01 -03:00
videobuf-dvb.c
videobuf-vmalloc.c
vino.c
vino.h
vivi.c
vp27smpx.c
vpx3220.c
w9966.c
wm8739.c
wm8775.c
zr364xx.c