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	[PATCH] Alchemy PCMCIA: Fix config.h inclusion	2005-11-10 11:18:26 +01:00
cardbus.c	[PATCH] yenta: auto-tune EnE bridges for CardBus cards	2005-09-26 13:09:20 +02:00
cirrus.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cistpl.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
cs_internal.h	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
cs.c	[PATCH] pcmcia: fix deadlock in pcmcia_parse_events	2006-06-30 22:09:13 +02:00
ds_internal.h	[PATCH] pcmcia: remove export of pcmcia_release_configuration	2006-03-31 17:15:53 +02:00
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	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
i82092aa.h	[PATCH] pcmcia: remove get_socket callback	2006-01-05 23:41:09 +01:00
i82365.c	[PATCH] 64bit resource: fix up printks for resources in pcmcia drivers	2006-06-27 09:23:59 -07:00
i82365.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
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	[PATCH] m32r: Update m32r_cfc.[ch] to support Mappi-III platform	2005-06-21 19:07:30 -07:00
m32r_pcc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
m32r_pcc.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	[PATCH] pcmcia: AT91RM9200 Compact Flash driver	2006-03-31 17:05:41 +02:00
o2micro.h	[PATCH] pcmcia: disable read prefetch/write burst on old O2Micro bridges	2005-07-28 08:39:01 -07:00
omap_cf.c	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
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	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pxa2xx_base.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pxa2xx_base.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pxa2xx_lubbock.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pxa2xx_mainstone.c	[ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc	2006-01-10 17:16:12 +00:00
pxa2xx_sharpsl.c	[ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure	2006-04-18 23:18:53 +01:00
ricoh.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
rsrc_mgr.c	[PATCH] pcmcia: size reduction if ioctl isn't compiled	2006-03-31 17:02:39 +02:00
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	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1100_assabet.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1100_badge4.c	[ARM] Fix badge4 build error	2006-06-19 15:37:31 +01:00
sa1100_cerf.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
sa1100_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1100_generic.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1100_h3600.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1100_jornada720.c	[PATCH] ARM: 2830/1: Fix Jornada 720 PCMCIA-support	2005-07-26 19:21:47 +01:00
sa1100_neponset.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1100_shannon.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1100_simpad.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sa1111_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1111_generic.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
soc_common.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
soc_common.h	[PATCH] pcmcia: remove references to pcmcia/version.h	2005-07-07 18:24:07 -07:00
socket_sysfs.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
tcic.c	[PATCH] 64bit resource: fix up printks for resources in pcmcia drivers	2006-06-27 09:23:59 -07:00
tcic.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ti113x.h	[PATCH] pcmcia: TI PCIxx12 CardBus controller support	2006-06-30 22:09:11 +02:00
topic.h	[PATCH] yenta: make ToPIC95 bridges work with 16bit cards	2005-09-07 16:57:21 -07:00
vg468.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
vrc4171_card.c	[PATCH] Don't pass boot parameters to argv_init[]	2006-03-31 12:18:53 -08:00
vrc4173_cardu.c	[PATCH] Don't pass boot parameters to argv_init[]	2006-03-31 12:18:53 -08:00
vrc4173_cardu.h	Update Yoichi Yuasa's email address.	2006-01-10 13:39:07 +00:00
yenta_socket.c	[PATCH] pcmcia: fix kernel-doc function name	2006-06-30 22:09:12 +02:00
yenta_socket.h	[PATCH] yenta: make ToPIC95 bridges work with 16bit cards	2005-09-07 16:57:21 -07:00