android_kernel_samsung_msm8976/drivers/media/video/saa7134
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
..
Kconfig V4L/DVB (3615): Saa7134: select FW_LOADER 2006-04-02 04:55:04 -03:00
Makefile kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree 2006-04-04 16:50:50 +02:00
saa6752hs.c V4L/DVB (4257): Fix 64-bit compile warnings. 2006-06-27 00:17:39 -03:00
saa7134-alsa.c V4L/DVB (4118): Whitespace cleanups 2006-06-25 02:05:10 -03:00
saa7134-cards.c V4L/DVB (4118): Whitespace cleanups 2006-06-25 02:05:10 -03:00
saa7134-core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
saa7134-dvb.c V4L/DVB (4028): Change dvb_frontend_ops to be a real field instead of a pointer field inside dvb_frontend 2006-06-25 02:00:42 -03:00
saa7134-empress.c V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API 2006-06-25 02:05:23 -03:00
saa7134-i2c.c V4L/DVB (3269): ioctls cleanups. 2006-01-09 15:32:31 -02:00
saa7134-input.c V4L/DVB (4023): Subject: Pinnacle PCTV grey remote control support 2006-06-25 02:00:28 -03:00
saa7134-oss.c V4L/DVB (3516): Make video_buf more generic 2006-03-24 16:26:49 -03:00
saa7134-reg.h [PATCH] v4l: 800: whitespace cleanups 2005-11-09 07:56:20 -08:00
saa7134-ts.c V4L/DVB (3516): Make video_buf more generic 2006-03-24 16:26:49 -03:00
saa7134-tvaudio.c V4L/DVB (3584): Implement V4L2_TUNER_MODE_LANG1_LANG2 audio mode 2006-03-24 16:26:58 -03:00
saa7134-vbi.c V4L/DVB (3516): Make video_buf more generic 2006-03-24 16:26:49 -03:00
saa7134-video.c V4L/DVB (3774): Create V4L1 config options 2006-05-12 19:54:53 -03:00
saa7134.h V4L/DVB (4115): Saa7134 card (LifeView3000 NTSC) 2006-06-25 02:05:10 -03:00