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
..
appletalk	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
arcnet	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
arm	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
bonding	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
chelsio	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cris	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
e1000	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fec_8xx	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fs_enet	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hamradio	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ibm_emac	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
irda	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ixgb	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ixp2000	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
myri10ge
pcmcia	[PATCH] com20020_cs: more device support	2006-06-30 22:09:13 +02:00
phy	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sk98lin	typo fixes: infomation -> information	2006-06-30 18:25:18 +02:00
skfp	typo fixes: bandwith -> bandwidth	2006-06-30 18:19:55 +02:00
tokenring	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tulip	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
wan	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
3c59x.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
3c515.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
8139too.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
8390.c
8390.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
82596.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
a2065.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
a2065.h
ac3200.c
acenic_firmware.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
acenic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
acenic.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
amd8111e.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
atari_bionet.c
atari_pamsnet.c
atarilance.c
atp.c
atp.h
au1000_eth.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1000_eth.h
b44.c
b44.h
bmac.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
bmac.h
bnx2_fw.h
bnx2.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
bnx2.h	[BNX2]: Turn off link during shutdown	2006-06-29 16:58:24 -07:00
bsd_comp.c
cassini.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cassini.h
cs89x0.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cs89x0.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
de600.c
de600.h
de620.c
de620.h
declance.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
defxx.c
defxx.h
depca.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
depca.h
dgrs_asstruct.h
dgrs_bcomm.h
dgrs_es4h.h
dgrs_ether.h
dgrs_firmware.c
dgrs_i82596.h
dgrs_plx9060.h
dgrs.c
dgrs.h
dl2k.c	typo fixes: infomation -> information	2006-06-30 18:25:18 +02:00
dl2k.h
dm9000.c
dm9000.h
dummy.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
e100.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
e2100.c
eepro100.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
eepro.c
eexpress.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
eexpress.h
epic100.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fec.h
forcedeth.c
gianfar_ethtool.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
gianfar_mii.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
gianfar_mii.h
gianfar_sysfs.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
gianfar.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
gianfar.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
gt64240eth.h
gt96100eth.c
gt96100eth.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hamachi.c
hp100.c
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ibmveth.h
ifb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ioc3-eth.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
isa-skeleton.c
iseries_veth.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
jazzsonic.c
Kconfig
lance.c
lasi_82596.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
mace.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mace.h
macmace.c
macsonic.c
Makefile
meth.c
meth.h
mii.c
mipsnet.c
mipsnet.h
mv643xx_eth.c
mv643xx_eth.h	typo fixes: infomation -> information	2006-06-30 18:25:18 +02:00
mvme147.c
myri_code.h
myri_sbus.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
myri_sbus.h
natsemi.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
ns83820.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
oaknet.c
pci-skeleton.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pcnet32.c
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ppp_mppe.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppox.c
r8169.c
rionet.c
rrunner.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
rrunner.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
s2io-regs.h
s2io.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
s2io.h	typo fixes: infomation -> information	2006-06-30 18:25:18 +02:00
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
shaper.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sis190.c
sis900.c
sis900.h
sk_mca.c
sk_mca.h
skge.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
skge.h
sky2.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sky2.h
slhc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
slip.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
slip.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
smc91x.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
smc91x.h
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sonic.c
sonic.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Space.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
spider_net_ethtool.c
spider_net.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
spider_net.h
starfire_firmware.h
starfire_firmware.pl
starfire.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
stnic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sungem_phy.h
sungem.c
sungem.h
sunhme.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sunhme.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sunlance.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sunqe.c
sunqe.h
tc35815.c
tg3.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tg3.h
tlan.c
tlan.h
tun.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
typhoon-firmware.h
typhoon.c
typhoon.h
via-rhine.c
via-velocity.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
via-velocity.h
wd.c
yellowfin.c
znet.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
zorro8390.c