android_kernel_samsung_msm8976/drivers/media/video
Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2006-06-30 15:39:30 -07:00
..
bt8xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
cpia2 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cx88 V4L/DVB (4285): Cx88: add support for Geniatech Digistar / Digiwave 103g 2006-06-30 15:59:46 -03:00
cx25840
em28xx V4L/DVB (4267): Remove all instances of request_module("tda9887") 2006-06-30 15:59:29 -03:00
et61x251
ovcamchip
pvrusb2 V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pwc Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
saa7134 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
sn9c102
usbvideo Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zc0301
adv7170.c
adv7175.c
arv.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
bt819.c
bt856.c
bt866.c
btcx-risc.c
btcx-risc.h
bw-qcam.c
bw-qcam.h
c-qcam.c
compat_ioctl32.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpia.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpia.h
cpia_pp.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpia_usb.c
cs53l32a.c
cs8420.h
cx2341x.c V4L/DVB (4259): Pass an explicit log prefix to cx2341x_log_status 2006-06-27 00:17:40 -03:00
dabfirmware.h
dabusb.c
dabusb.h
dpc7146.c
dsbr100.c
font.h
hexium_gemini.c
hexium_orion.c
ibmmpeg2.h
indycam.c
indycam.h
ir-kbd-i2c.c
Kconfig V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
ks0127.c
ks0127.h
Makefile V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
meye.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
meye.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
msp3400-driver.c
msp3400-driver.h V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned 2006-06-30 15:59:30 -03:00
msp3400-kthreads.c
mt20xx.c
mxb.c
mxb.h
ov511.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ov511.h
planb.c
planb.h
pms.c
saa711x.c
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 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
se401.h
stradis.c V4L/DVB (4260): Stradis.c: make 2 functions static 2006-06-27 00:17:41 -03:00
stv680.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
stv680.h
tda7432.c
tda8290.c
tda9840.c
tda9840.h
tda9875.c
tda9887.c V4L/DVB (4270): Add tda9887-specific tuner configuration 2006-06-30 15:59:32 -03:00
tea5767.c
tea6415c.c
tea6415c.h
tea6420.c
tea6420.h
tlv320aic23b.c
tuner-3036.c
tuner-core.c V4L/DVB (4281): TDA9887_SET_CONFIG should only be handled by the tda9887. 2006-06-30 15:59:42 -03:00
tuner-simple.c V4L/DVB (4270): Add tda9887-specific tuner configuration 2006-06-30 15:59:32 -03:00
tuner-types.c V4L/DVB (4270): Add tda9887-specific tuner configuration 2006-06-30 15:59:32 -03:00
tvaudio.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
tveeprom.c V4L/DVB (4290): Add support for the TCL M2523_3DB_E tuner. 2006-06-30 15:59:53 -03:00
tvmixer.c
tvp5150.c
tvp5150_reg.h
upd64031a.c
upd64083.c
v4l1-compat.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
v4l2-common.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
video-buf-dvb.c
video-buf.c
videocodec.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
videocodec.h V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned 2006-06-30 15:59:30 -03:00
videodev.c [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed 2006-06-26 12:25:08 -07:00
vino.c
vino.h
vivi.c
vpx3220.c
w9966.c
w9968cf.c
w9968cf.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
w9968cf_decoder.h
w9968cf_vpp.h
wm8739.c
wm8775.c
zoran.h
zoran_card.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zoran_card.h
zoran_device.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zoran_device.h
zoran_driver.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zoran_procfs.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
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 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zr36120_mem.h