Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes)		2011-07-25 13:56:39 -07:00
..
at91_cf.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
au1000_generic.c	pcmcia: don't call flush_scheduled_work() spuriously	2010-10-16 11:07:37 +02:00
au1000_generic.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
au1000_pb1x00.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
bcm63xx_pcmcia.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
cardbus.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
cirrus.h
cistpl.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
cs_internal.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
cs.c	pcmcia: fix unused function compile warning	2010-10-14 11:47:16 +02:00
db1xxx_ss.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
ds.c	pcmcia: Make declaration and uses of struct pcmcia_device_id const	2011-05-06 07:46:15 +02:00
electra_cf.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
i82092.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
i82092aa.h
i82365.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
i82365.h	pcmcia: honor saved flags in yenta_socket's I365_CSCINT register	2010-03-15 14:50:15 +01:00
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
m8xx_pcmcia.c	dt: Eliminate of_platform_{,un}register_driver	2011-02-28 13:22:46 -07:00
m32r_cfc.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
m32r_cfc.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
m32r_pcc.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
m32r_pcc.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
Makefile	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
o2micro.h	pcmcia/yenta: guide users in case of problems with O2-bridges	2010-10-15 14:31:47 +02:00
omap_cf.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
pcmcia_cis.c	pcmcia: use autoconfiguration feature for ioports and iomem	2010-09-29 17:20:24 +02:00
pcmcia_resource.c	Revert wrong fixes for common misspellings	2011-04-26 23:31:11 -07:00
pd6729.c	pd6729: Coding Style fixes	2010-11-10 14:29:09 +01:00
pd6729.h	pd6729: Coding Style fixes	2010-11-10 14:29:09 +01:00
pxa2xx_balloon3.c	pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform	2011-04-12 23:07:42 +08:00
pxa2xx_base.c	pcmcia vs. MECR on pxa25x/sa1111	2011-02-19 12:22:35 +01:00
pxa2xx_base.h	pcmcia vs. MECR on pxa25x/sa1111	2011-02-19 12:22:35 +01:00
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c
pxa2xx_cm_x270.c
pxa2xx_colibri.c	ARM: pxa: Use gpio arrays in colibri_pcmcia driver	2011-03-16 16:32:45 +08:00
pxa2xx_e740.c
pxa2xx_lubbock.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
pxa2xx_mainstone.c
pxa2xx_palmld.c	ARM: pxa: Update copyright notices for Palm devices	2011-03-16 16:32:46 +08:00
pxa2xx_palmtc.c	ARM: pxa: Update copyright notices for Palm devices	2011-03-16 16:32:46 +08:00
pxa2xx_palmtx.c	ARM: pxa: Update copyright notices for Palm devices	2011-03-16 16:32:46 +08:00
pxa2xx_sharpsl.c	ARM: scoop: drop pcmcia_init callback	2011-07-11 14:43:32 +08:00
pxa2xx_stargate2.c
pxa2xx_trizeps4.c	pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefs	2011-07-11 14:43:33 +08:00
pxa2xx_viper.c
pxa2xx_vpac270.c	pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting	2011-07-11 14:26:34 +08:00
ricoh.h
rsrc_iodyn.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
rsrc_mgr.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
rsrc_nonstatic.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
sa11xx_base.c	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02:00
sa11xx_base.h
sa1100_assabet.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_badge4.c
sa1100_cerf.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_generic.c	pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data	2011-05-06 07:46:11 +02:00
sa1100_generic.h	ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.	2010-12-21 14:53:45 +00:00
sa1100_h3600.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_jornada720.c
sa1100_nanoengine.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
sa1100_neponset.c
sa1100_shannon.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_simpad.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1111_generic.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sa1111_generic.h
soc_common.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
soc_common.h	ARM: pxa: remove get_memclk_frequency_10khz()	2010-12-16 14:31:19 +08:00
socket_sysfs.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
tcic.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
tcic.h
ti113x.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
topic.h
vg468.h
vrc4171_card.c	pcmcia: use dev_pm_ops for class pcmcia_socket_class	2010-03-24 11:00:11 +01:00
vrc4173_cardu.c	pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device	2010-10-05 15:49:51 +02:00
vrc4173_cardu.h
xxs1500_ss.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
yenta_socket.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
yenta_socket.h