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
..
agp	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
drm	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ftape	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hw_random
ip2	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ipmi	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mwave	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pcmcia	[PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV()	2006-06-30 22:09:13 +02:00
rio	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tpm
watchdog	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
.gitignore
amiserial.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
applicom.c
applicom.h
cd1865.h
ChangeLog
consolemap.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cp437.uni
cs5535_gpio.c
cyclades.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
decserial.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digi.h
digiFep1.h
digiPCI.h
ds1286.c
ds1302.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ds1620.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
dsp56k.c
dtlk.c
ec3104_keyb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
efirtc.c
epca.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
epca.h
epcaconfig.h
esp.c
generic_nvram.c
generic_serial.c
genrtc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hangcheck-timer.c
hpet.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hvc_console.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hvc_console.h
hvc_rtas.c
hvc_vio.c
hvcs.c
hvsi.c
i8k.c
ip27-rtc.c
isicom.c
istallion.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
ite_gpio.c
Kconfig
keyboard.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
lcd.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
lcd.h
lp.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Makefile
mbcs.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mbcs.h
mem.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
misc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mmtimer.c
moxa.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mxser.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mxser.h
n_hdlc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
n_r3964.c
n_tty.c
nsc_gpio.c
nvram.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
nwbutton.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
nwbutton.h
nwflash.c
pc8736x_gpio.c	[PATCH] fix platform_device_put/del mishaps	2006-06-30 11:25:34 -07:00
ppdev.c
pty.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
qtronix.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
qtronixmap.c_shipped
qtronixmap.map
random.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
raw.c
riscom8_reg.h
riscom8.c
riscom8.h
rocket_int.h
rocket.c
rocket.h
rtc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
s3c2410-rtc.c
scan_keyb.c
scan_keyb.h
scc.h
scx200_gpio.c	[PATCH] fix platform_device_put/del mishaps	2006-06-30 11:25:34 -07:00
selection.c
ser_a2232.c
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
snsc_event.c
snsc.c
snsc.h
sonypi.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
specialix_io8.h
specialix.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
stallion.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sx.c
sx.h
sxboards.h
sxwindow.h
synclink_gt.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
synclink.c
synclinkmp.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sysrq.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tb0219.c
tipar.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tlclk.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
toshiba.c
tty_io.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tty_ioctl.c
vc_screen.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
viocons.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
viotape.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
vme_scc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
vr41xx_giu.c
vt_ioctl.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
vt.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00