You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits) Revert "tracing: Include module.h in define_trace.h" irq: don't put module.h into irq.h for tracking irqgen modules. bluetooth: macroize two small inlines to avoid module.h ip_vs.h: fix implicit use of module_get/module_put from module.h nf_conntrack.h: fix up fallout from implicit moduleparam.h presence include: replace linux/module.h with "struct module" wherever possible include: convert various register fcns to macros to avoid include chaining crypto.h: remove unused crypto_tfm_alg_modname() inline uwb.h: fix implicit use of asm/page.h for PAGE_SIZE pm_runtime.h: explicitly requires notifier.h linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h miscdevice.h: fix up implicit use of lists and types stop_machine.h: fix implicit use of smp.h for smp_processor_id of: fix implicit use of errno.h in include/linux/of.h of_platform.h: delete needless include <linux/module.h> acpi: remove module.h include from platform/aclinux.h miscdevice.h: delete unnecessary inclusion of module.h device_cgroup.h: delete needless include <linux/module.h> net: sch_generic remove redundant use of <linux/module.h> net: inet_timewait_sock doesnt need <linux/module.h> ... Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in - drivers/media/dvb/frontends/dibx000_common.c - drivers/media/video/{mt9m111.c,ov6650.c} - drivers/mfd/ab3550-core.c - include/linux/dmaengine.h		13 years ago
..
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	14 years ago
Makefile	Merge branch 'devel-stable' into devel	14 years ago
at91_cf.c	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago
au1000_generic.c	pcmcia: don't call flush_scheduled_work() spuriously	14 years ago
au1000_generic.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
au1000_pb1x00.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
bcm63xx_pcmcia.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
bcm63xx_pcmcia.h	MIPS: BCM63xx: Add PCMCIA & Cardbus support.	15 years ago
bfin_cf_pcmcia.c	drivers: Final irq namespace conversion	14 years ago
cardbus.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	15 years ago
cirrus.h	pcmcia: drop already defined PCI_IDs	15 years ago
cistpl.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
cs.c	pcmcia: fix unused function compile warning	14 years ago
cs_internal.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
db1xxx_ss.c	pcmcia: add module.h to db1xxx_ss.c since it is modular.	13 years ago
ds.c	pcmcia: Make declaration and uses of struct pcmcia_device_id const	14 years ago
electra_cf.c	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago
i82092.c	Fix common misspellings	14 years ago
i82092aa.h	…
i82365.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
i82365.h	pcmcia: honor saved flags in yenta_socket's I365_CSCINT register	15 years ago
m8xx_pcmcia.c	dt: Eliminate of_platform_{,un}register_driver	14 years ago
m32r_cfc.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
m32r_cfc.h	tree-wide: fix comment/printk typos	14 years ago
m32r_pcc.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
m32r_pcc.h	tree-wide: fix comment/printk typos	14 years ago
o2micro.h	pcmcia/yenta: guide users in case of problems with O2-bridges	14 years ago
omap_cf.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	15 years ago
pcmcia_cis.c	pcmcia: use autoconfiguration feature for ioports and iomem	14 years ago
pcmcia_resource.c	Revert wrong fixes for common misspellings	14 years ago
pd6729.c	pd6729: Coding Style fixes	14 years ago
pd6729.h	pd6729: Coding Style fixes	14 years ago
pxa2xx_balloon3.c	ARM: pxa: use correct __iomem annotations	13 years ago
pxa2xx_base.c	ARM: PXA: fix lubbock PCMCIA driver build error	13 years ago
pxa2xx_base.h	pcmcia vs. MECR on pxa25x/sa1111	14 years ago
pxa2xx_cm_x2xx.c	ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver	13 years ago
pxa2xx_cm_x255.c	pcmcia: Add export.h to drivers/pcmcia as required.	13 years ago
pxa2xx_cm_x270.c	pcmcia: Add export.h to drivers/pcmcia as required.	13 years ago
pxa2xx_colibri.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	14 years ago
pxa2xx_e740.c	PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket	15 years ago
pxa2xx_lubbock.c	Fix common misspellings	14 years ago
pxa2xx_mainstone.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	14 years ago
pxa2xx_palmld.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	14 years ago
pxa2xx_palmtc.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	14 years ago
pxa2xx_palmtx.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	14 years ago
pxa2xx_sharpsl.c	ARM: scoop: drop pcmcia_init callback	14 years ago
pxa2xx_stargate2.c	pxa2xx pcmcia - stargate 2 use gpio array.	14 years ago
pxa2xx_trizeps4.c	pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefs	14 years ago
pxa2xx_viper.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	14 years ago
pxa2xx_vpac270.c	ARM: gpio: pxa: convert drivers to use asm/gpio.h rather than mach/gpio.h	14 years ago
ricoh.h	…
rsrc_iodyn.c	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago
rsrc_mgr.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
rsrc_nonstatic.c	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago
sa11xx_base.c	fix typos concerning "initiali[zs]e"	15 years ago
sa11xx_base.h	PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data	15 years ago
sa1100_assabet.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	14 years ago
sa1100_badge4.c	PCMCIA: sa1111: remove duplicated initializers	15 years ago
sa1100_cerf.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	14 years ago
sa1100_generic.c	pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data	14 years ago
sa1100_generic.h	ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.	14 years ago
sa1100_h3600.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	14 years ago
sa1100_jornada720.c	PCMCIA: sa1111: remove duplicated initializers	15 years ago
sa1100_nanoengine.c	drivers: Final irq namespace conversion	14 years ago
sa1100_neponset.c	PCMCIA: sa1111: remove duplicated initializers	15 years ago
sa1100_shannon.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	14 years ago
sa1100_simpad.c	ARM: 7024/1: simpad: Cleanup CS3 accessors.	13 years ago
sa1111_generic.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
sa1111_generic.h	PCMCIA: sa1111: remove duplicated initializers	15 years ago
soc_common.c	drivers:pcmcia:soc_common: make socket_init and socket_suspend optional	14 years ago
soc_common.h	ARM: pxa: remove get_memclk_frequency_10khz()	14 years ago
socket_sysfs.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
tcic.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	14 years ago
tcic.h	…
ti113x.h	Fix common misspellings	14 years ago
topic.h	pcmcia: correct handling for Zoomed Video registers in topic.h	15 years ago
vg468.h	…
vrc4171_card.c	pcmcia: use dev_pm_ops for class pcmcia_socket_class	15 years ago
vrc4173_cardu.c	pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device	14 years ago
vrc4173_cardu.h	…
xxs1500_ss.c	drivers: Final irq namespace conversion	14 years ago
yenta_socket.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
yenta_socket.h	…