android_kernel_samsung_msm8976/drivers/media/video/bt8xx
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
..
bt832.c V4L/DVB (3577): Cleanup audio input handling 2006-03-24 16:26:56 -03:00
bt832.h V4L/DVB (3539): Move bttv fragments to bt8xx/ 2006-03-24 16:26:50 -03:00
bt848.h V4L/DVB (3539): Move bttv fragments to bt8xx/ 2006-03-24 16:26:50 -03:00
bttv-cards.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
bttv-driver.c [PATCH] 64bit resource: fix up printks for resources in video drivers 2006-06-27 09:23:59 -07:00
bttv-gpio.c V4L/DVB (4026): Bttv-gpio-irq is no longer used, remove it 2006-06-25 02:00:30 -03:00
bttv-i2c.c V4L/DVB (3577): Cleanup audio input handling 2006-03-24 16:26:56 -03:00
bttv-if.c V4L/DVB (3539): Move bttv fragments to bt8xx/ 2006-03-24 16:26:50 -03:00
bttv-input.c V4L/DVB (4118): Whitespace cleanups 2006-06-25 02:05:10 -03:00
bttv-risc.c V4L/DVB (3704): Fix some errors on bttv_risc_overlay 2006-05-12 19:54:35 -03:00
bttv-vbi.c V4L/DVB (3614): Fix compilation warning at powerpc platform 2006-04-02 04:55:02 -03:00
bttv.h V4L/DVB (4026): Bttv-gpio-irq is no longer used, remove it 2006-06-25 02:00:30 -03:00
bttvp.h typo fixes: aquire -> acquire 2006-06-30 18:23:04 +02:00
Kconfig V4L/DVB (3774): Create V4L1 config options 2006-05-12 19:54:53 -03:00
Makefile V4L/DVB (3731): Kbuild: drivers/media/video/bt8xx: remove $(src) from include path 2006-05-12 19:54:40 -03:00