original_kernel/drivers/media/video
Linus Torvalds 708e16892e Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
2006-10-03 16:35:11 -07:00
..
bt8xx V4L/DVB (4698): Fix S-Video configuration for Pinnacle PCTV-Sat 2006-10-03 15:15:00 -03:00
cpia2
cx88 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
cx25840
em28xx
et61x251
ovcamchip
pvrusb2 V4L/DVB (4675): Pvrusb2: Fix VIDIOC_INT_[G|S]_REGISTER so that it actually works now 2006-10-03 15:14:26 -03:00
pwc remove mentionings of devfs in documentation 2006-10-03 22:17:48 +02:00
saa7134 V4L/DVB (4671): Support for SAA7134-based AVerTV Hybrid A16AR 2006-10-03 15:14:11 -03:00
sn9c102
usbvideo
zc0301
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
Makefile
adv7170.c
adv7175.c
arv.c
bt819.c
bt856.c
bt866.c
btcx-risc.c
btcx-risc.h
bw-qcam.c
bw-qcam.h
c-qcam.c
compat_ioctl32.c
cpia.c
cpia.h
cpia_pp.c
cpia_usb.c
cs53l32a.c
cs8420.h
cx2341x.c
dabfirmware.h
dabusb.c
dabusb.h
dpc7146.c
font.h
hexium_gemini.c
hexium_orion.c
ibmmpeg2.h
indycam.c
indycam.h
ir-kbd-i2c.c V4L/DVB (4670): Allow RC5 codes 64 - 127 in ir-kbd-i2c.c 2006-10-03 15:14:04 -03:00
ks0127.c
ks0127.h
meye.c
meye.h
msp3400-driver.c V4L/DVB (4688): Fix msp343xG handling (regression from 2.6.16) 2006-10-03 15:14:55 -03:00
msp3400-driver.h V4L/DVB (4688): Fix msp343xG handling (regression from 2.6.16) 2006-10-03 15:14:55 -03:00
msp3400-kthreads.c V4L/DVB (4688): Fix msp343xG handling (regression from 2.6.16) 2006-10-03 15:14:55 -03:00
mt20xx.c
mxb.c
mxb.h
ov511.c
ov511.h
planb.c
planb.h
pms.c
saa711x.c
saa711x_regs.h
saa5246a.c
saa5246a.h
saa5249.c
saa6588.c
saa7110.c
saa7111.c
saa7114.c
saa7115.c
saa7121.h
saa7127.c
saa7146.h
saa7146reg.h
saa7185.c
saa7191.c
saa7191.h
saa7196.h
se401.c
se401.h
stradis.c
stv680.c
stv680.h
tda7432.c
tda8290.c
tda9840.c
tda9840.h
tda9875.c
tda9887.c
tea5767.c
tea6415c.c
tea6415c.h
tea6420.c
tea6420.h
tlv320aic23b.c
tuner-3036.c
tuner-core.c
tuner-simple.c
tuner-types.c
tvaudio.c
tveeprom.c
tvmixer.c
tvp5150.c
tvp5150_reg.h
upd64031a.c
upd64083.c
v4l1-compat.c
v4l2-common.c
video-buf-dvb.c
video-buf.c V4L/DVB (4685): Fix compiler warning in drivers/media/video/video-buf.c 2006-10-03 15:14:48 -03:00
videocodec.c
videocodec.h
videodev.c
vino.c
vino.h
vivi.c
vpx3220.c
w9966.c
w9968cf.c
w9968cf.h
w9968cf_decoder.h
w9968cf_vpp.h
wm8739.c
wm8775.c
zoran.h
zoran_card.c
zoran_card.h
zoran_device.c
zoran_device.h
zoran_driver.c
zoran_procfs.c
zoran_procfs.h
zr36016.c
zr36016.h
zr36050.c
zr36050.h
zr36057.h
zr36060.c
zr36060.h
zr36120.c
zr36120.h
zr36120_i2c.c
zr36120_mem.c
zr36120_mem.h