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	[PATCH] Detaching fbcon: remove calls to pci_disable_device()	2006-06-26 09:58:32 -07:00
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	[PATCH] fbdev: Sanitize ->fb_mmap prototype	2006-01-14 18:27:15 -08:00
acornfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
acornfb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
amba-clcd.c	[ARM] amba-clcd: Allow RGB555 and RGB565 with 16bpp	2006-01-26 14:12:06 +00:00
amifb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
arcfb.c	[PATCH] arcfb: Fix dereference before NULL check	2006-03-11 09:19:35 -08:00
asiliantfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
atafb.c	[PATCH] fbdev: Sanitize ->fb_ioctl prototype	2006-01-14 18:27:14 -08:00
au1100fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1100fb.h	Au1100 FB driver uplift for 2.6.	2005-10-29 19:31:01 +01:00
au1200fb.c	[PATCH] au1200fb: Remove accidentally duplicated content of au1200fb.c	2006-04-29 17:05:11 -07:00
au1200fb.h	[PATCH] au1200fb: Alchemy Au1200 framebuffer driver	2006-03-27 08:44:55 -08:00
bt431.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
bt455.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
bw2.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
c2p.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
c2p.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
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	[PATCH] fbcon/fbdev: Move softcursor out of fbdev to fbcon	2005-11-07 07:53:50 -08:00
controlfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
controlfb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
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	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cyberfb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cyblafb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
dnfb.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
edid.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
epson1355fb.c	[PATCH] epson1355fb: Update platform code	2006-06-26 09:58:29 -07:00
fbcmap.c	[PATCH] framebuffer: cmap-setting return values	2006-03-27 08:44:56 -08:00
fbcvt.c	[PATCH] fbdev: Remove unused exports	2006-06-26 09:58:31 -07:00
fbmem.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fbmon.c	[PATCH] fbdev: Firmware EDID fixes	2006-06-26 09:58:30 -07:00
fbsysfs.c	[PATCH] Detaching fbcon: sdd sysfs class device entry for fbcon	2006-06-26 09:58:32 -07:00
ffb.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
fm2fb.c	[PATCH] fbcon/fbdev: Move softcursor out of fbdev to fbcon	2005-11-07 07:53:50 -08:00
g364fb.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
gbefb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hgafb.c	[PATCH] fbdev: hgafb: Convert to platform device	2006-01-10 08:01:45 -08:00
hitfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hpfb.c	[PATCH] hp300: fix driver_register() return handling, remove dio_module_init()	2006-03-25 08:22:53 -08:00
igafb.c	[PATCH] mm: remove VM_LOCKED before remap_pfn_range and drop VM_SHM	2006-06-25 10:00:55 -07:00
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	[PATCH] ARM: 2687/1: i.MX framebuffer: make dmacr register platform configurable	2005-07-17 20:15:36 +01:00
Kconfig	[PATCH] imacfb: Add Intel-based Macintosh Framebuffer Support	2006-06-26 09:58:32 -07:00
leo.c	[SPARC]: Convert all FB SBUS drivers to of_driver framework.	2006-06-29 16:37:18 -07:00
macfb.c	[PATCH] m68k: fix macfb init	2006-01-12 09:09:05 -08:00
macmodes.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
macmodes.h	[PATCH] macmodes: Fix section warning	2006-06-26 09:58:31 -07:00
Makefile	[PATCH] Detaching fbcon: sdd sysfs class device entry for fbcon	2006-06-26 09:58:32 -07:00
maxinefb.c	[PATCH] maxinefb: Fix compilation error	2006-05-31 16:27:11 -07:00
modedb.c	[PATCH] fbdev: Remove unused exports	2006-06-26 09:58:31 -07:00
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	[PATCH] powerpc: Fix platinumfb for some modes	2006-01-09 14:53:51 +11:00
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	[PATCH] fbdev: Sanitize ->fb_ioctl prototype	2006-01-14 18:27:14 -08:00
pmag-ba-fb.c	[PATCH] remove bogus asm/bug.h includes.	2006-02-07 20:56:35 -05:00
pmagb-b-fb.c	[PATCH] drivers/video: Use ARRAY_SIZE macro	2006-03-27 08:44:58 -08:00
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	[ARM] pxafb: Remove #if DEBUG, convert DPRINTK to pr_debug	2005-09-29 09:44:54 +01:00
q40fb.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
retz3fb.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
retz3fb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
s1d13xxxfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
s3c2410fb.c	[PATCH] s3c2410fb: Fix resume	2006-06-26 09:58:31 -07:00
s3c2410fb.h	[PATCH] s3c2410fb: ARM S3C2410 framebuffer driver	2005-09-09 14:03:42 -07:00
S3triofb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1100fb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1100fb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sbuslib.c	[SPARC]: Respect vm_page_prot in io_remap_page_range().	2006-03-22 01:15:13 -08:00
sbuslib.h	[SPARC]: Fix sbusfb build.	2006-01-17 15:53:11 -08:00
sgivwfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
skeletonfb.c	[PATCH] skeletonfb: remove duplicate module init, exit, license lines	2006-06-26 09:58:31 -07:00
sstfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sticore.h	[PARISC] Fix stifb with IOREMAP and a 64-bit kernel	2006-03-30 17:48:47 +00:00
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	[PATCH] fbdev: Remove duplicate #include's	2006-06-26 09:58:28 -07:00
tridentfb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
tx3912fb.c	[PATCH] fbcon/fbdev: Move softcursor out of fbdev to fbcon	2005-11-07 07:53:50 -08:00
valkyriefb.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
valkyriefb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
vesafb.c	[PATCH] vesafb: Prefer VGA registers over PMI	2006-06-26 09:58:30 -07:00
vfb.c	[PATCH] vfb: Update platform code	2006-06-26 09:58:29 -07:00
vga16fb.c	[PATCH] vga16fb: Update platform code	2006-06-26 09:58:29 -07:00
vgastate.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
virgefb.c	[PATCH] drivers/video: Use ARRAY_SIZE macro	2006-03-27 08:44:58 -08:00
virgefb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
w100fb.c	[PATCH] w100fb: Add acceleration support to ATI Imageon	2006-03-31 12:19:00 -08:00
w100fb.h	[PATCH] w100fb: Add acceleration support to ATI Imageon	2006-03-31 12:19:00 -08:00