original_kernel/drivers/media/dvb
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
..
b2c2 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
bt8xx Fixes some sync issues between V4L/DVB development and GIT 2006-06-25 02:05:24 -03:00
cinergyT2 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
dvb-core V4L/DVB (4282): Fix: use swzigzag for swalgo 2006-06-30 15:59:43 -03:00
dvb-usb Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
frontends Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
pluto2 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
ttpci Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
ttusb-budget typo fixes: bandwith -> bandwidth 2006-06-30 18:19:55 +02:00
ttusb-dec 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
Kconfig
Makefile