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
..
at91_cf.c	[PATCH] pcmcia: at91_cf suspend/resume/wakeup	2006-06-30 22:09:12 +02:00
au1000_db1x00.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
au1000_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1000_generic.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1000_pb1x00.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1000_xxs1500.c
cardbus.c
cirrus.h
cistpl.c
cs_internal.h
cs.c	[PATCH] pcmcia: fix deadlock in pcmcia_parse_events	2006-06-30 22:09:13 +02:00
ds_internal.h
ds.c	[PATCH] pcmcia: missing pcmcia_get_socket() result check	2006-06-02 00:56:17 +02:00
hd64465_ss.c	[PATCH] genirq: rename desc->handler to desc->chip	2006-06-29 10:26:21 -07:00
i82092.c
i82092aa.h
i82365.c	[PATCH] 64bit resource: fix up printks for resources in pcmcia drivers	2006-06-27 09:23:59 -07:00
i82365.h
Kconfig	[PATCH] vrc4171: update config	2006-04-22 00:49:18 +02:00
m8xx_pcmcia.c	[PATCH] spin/rwlock init cleanups	2006-06-27 17:32:39 -07:00
m32r_cfc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
m32r_cfc.h
m32r_pcc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
m32r_pcc.h
Makefile
o2micro.h
omap_cf.c
pcmcia_ioctl.c	[PATCH] pcmcia Oopses fixes	2006-05-15 11:20:54 -07:00
pcmcia_resource.c	[PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ	2006-06-30 22:09:10 +02:00
pd6729.c	[PATCH] 64bit resource: fix up printks for resources in pcmcia drivers	2006-06-27 09:23:59 -07:00
pd6729.h
pxa2xx_base.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pxa2xx_base.h
pxa2xx_lubbock.c
pxa2xx_mainstone.c
pxa2xx_sharpsl.c
ricoh.h
rsrc_mgr.c
rsrc_nonstatic.c	[PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed	2006-06-27 09:24:00 -07:00
sa11xx_base.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c	[ARM] Fix badge4 build error	2006-06-19 15:37:31 +01:00
sa1100_cerf.c
sa1100_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1111_generic.h
soc_common.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
soc_common.h
socket_sysfs.c
tcic.c	[PATCH] 64bit resource: fix up printks for resources in pcmcia drivers	2006-06-27 09:23:59 -07:00
tcic.h
ti113x.h	[PATCH] pcmcia: TI PCIxx12 CardBus controller support	2006-06-30 22:09:11 +02:00
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
yenta_socket.c	[PATCH] pcmcia: fix kernel-doc function name	2006-06-30 22:09:12 +02:00
yenta_socket.h