kernel-ark/drivers/media/dvb/frontends
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
..
bcm3510_priv.h
bcm3510.c
bcm3510.h
bsbe1.h
bsru6.h
cx22700.c
cx22700.h
cx22702.c
cx22702.h
cx24110.c
cx24110.h
cx24123.c
cx24123.h
dib3000-common.c
dib3000-common.h
dib3000.h
dib3000mb_priv.h
dib3000mb.c
dib3000mc_priv.h
dib3000mc.c
dvb_dummy_fe.c
dvb_dummy_fe.h
dvb-pll.c
dvb-pll.h
isl6421.c
isl6421.h
Kconfig
l64781.c
l64781.h
lg_h06xf.h
lgdt330x_priv.h
lgdt330x.c
lgdt330x.h
lnbp21.c
lnbp21.h
Makefile
mt312_priv.h
mt312.c
mt312.h
mt352_priv.h
mt352.c
mt352.h
nxt200x.c
nxt200x.h
nxt6000_priv.h
nxt6000.c
nxt6000.h
or51132.c
or51132.h
or51211.c
or51211.h
s5h1420.c
s5h1420.h
sp887x.c
sp887x.h
sp8870.c
sp8870.h
stv0297.c
stv0297.h
stv0299.c
stv0299.h
tda1004x.c
tda1004x.h
tda8083.c
tda8083.h
tda10021.c
tda10021.h
ves1x93.c
ves1x93.h
ves1820.c
ves1820.h
zl10353_priv.h
zl10353.c
zl10353.h