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
..
aty	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
backlight	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
console	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
geode	…
i810	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
intelfb	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
kyro	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
logo	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
matrox	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
nvidia	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
riva	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
savage	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sis	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
68328fb.c	…
Kconfig	…
Makefile	…
S3triofb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
acornfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
acornfb.h	…
amba-clcd.c	…
amifb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
arcfb.c	…
asiliantfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
atafb.c	…
au1100fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1100fb.h	…
au1200fb.c	…
au1200fb.h	…
bt431.h	…
bt455.h	…
bw2.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
c2p.c	…
c2p.h	…
cfbcopyarea.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cfbfillrect.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cfbimgblt.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cg3.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
cg6.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
cg14.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
chipsfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cirrusfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
clps711xfb.c	…
controlfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
controlfb.h	…
cyber2000fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cyber2000fb.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cyberfb.c	…
cyberfb.h	…
cyblafb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
dnfb.c	…
edid.h	…
epson1355fb.c	…
fbcmap.c	…
fbcvt.c	…
fbmem.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fbmon.c	…
fbsysfs.c	…
ffb.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
fm2fb.c	…
g364fb.c	…
gbefb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hgafb.c	…
hitfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hpfb.c	…
igafb.c	…
imacfb.c	[PATCH] fix drivers/video/imacfb.c compilation	2006-06-30 11:25:34 -07:00
imsttfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
imxfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
imxfb.h	…
leo.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
macfb.c	…
macmodes.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
macmodes.h	…
maxinefb.c	…
modedb.c	…
neofb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
offb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
p9100.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
platinumfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
platinumfb.h	…
pm2fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pm3fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pmag-aa-fb.c	…
pmag-ba-fb.c	…
pmagb-b-fb.c	…
pvr2fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pxafb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pxafb.h	…
q40fb.c	…
retz3fb.c	…
retz3fb.h	…
s1d13xxxfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
s3c2410fb.c	…
s3c2410fb.h	…
sa1100fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1100fb.h	…
sbuslib.c	…
sbuslib.h	…
sgivwfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
skeletonfb.c	…
sstfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sticore.h	…
stifb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sun3fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tcx.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
tdfxfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tgafb.c	…
tridentfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tx3912fb.c	…
valkyriefb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
valkyriefb.h	…
vesafb.c	…
vfb.c	…
vga16fb.c	…
vgastate.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
virgefb.c	…
virgefb.h	…
w100fb.c	…
w100fb.h	…