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
..
include/mach	Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc	13 years ago
Kconfig	ARM: S3C64XX: Use module identification for Cragganmore system builds	14 years ago
Makefile	ARM: S3C64XX: To merge devs.c files to one devs.c	14 years ago
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	14 years ago
clock.c	Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2	14 years ago
cpu.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
dev-audio.c	arm: Add export.h to ARM specific files as required.	13 years ago
dev-spi.c	ARM: SAMSUNG: Add tx_st_done variable	14 years ago
dev-uart.c	ARM: SAMSUNG: Remove uart irq handling from plaform code	14 years ago
dma.c	Merge branch 'next/topic-dma-samsung' into next-samsung-devel	14 years ago
irq-eint.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
irq-pm.c	ARM / Samsung: Use struct syscore_ops for "core" power management	14 years ago
irq.c	ARM: SAMSUNG: Remove uart irq handling from plaform code	14 years ago
mach-anw6410.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-crag6410-module.c	ARM: S3C64XX: Add devices for Kilchoman audio module on Cragganmore	14 years ago
mach-crag6410.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-hmt.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-mini6410.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-ncp.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-real6410.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-smartq.c	ARM: 6351/1: s3c64xx: don't put smartq_bl_init in .init.text	15 years ago
mach-smartq.h	ARM: S3C6410: Add basic support for SmartQ machines	15 years ago
mach-smartq5.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-smartq7.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-smdk6400.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
mach-smdk6410.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	13 years ago
pm.c	ARM: S3C64XX: Save/restore S3C64XX_MODEM_MIFPCON on suspend/resume	14 years ago
s3c6400.c	ARM: SAMSUNG: Moving each SoC support header files	14 years ago
s3c6410.c	ARM: SAMSUNG: Moving each SoC support header files	14 years ago
setup-fb-24bpp.c	ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx	14 years ago
setup-i2c0.c	ARM: S3C64XX: Remove gpio-bank-X header files	14 years ago
setup-i2c1.c	ARM: S3C64XX: Remove gpio-bank-X header files	14 years ago
setup-ide.c	ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped	15 years ago
setup-keypad.c	ARM: S3C64XX: Fix keypad setup to configure correct number of rows	14 years ago
setup-sdhci-gpio.c	ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull()	15 years ago
setup-sdhci.c	ARM: SAMSUNG: remove sdhci default configuration setup platform helper	14 years ago
sleep.S	ARM: pm: samsung: move cpu_suspend into C code	14 years ago