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
..
masters	MAINTAINERS: Evgeniy has moved	14 years ago
slaves	drivers/power/ds2780_battery.c: add a nolock function to w1 interface	13 years ago
Kconfig	…
Makefile	…
w1.c	MAINTAINERS: Evgeniy has moved	14 years ago
w1.h	MAINTAINERS: Evgeniy has moved	14 years ago
w1_family.c	drivers/w1: Add export.h for EXPORT_SYMBOL/THIS_MODULE	13 years ago
w1_family.h	MAINTAINERS: Evgeniy has moved	14 years ago
w1_int.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	13 years ago
w1_int.h	MAINTAINERS: Evgeniy has moved	14 years ago
w1_io.c	w1: disable irqs in critical section	13 years ago
w1_log.h	MAINTAINERS: Evgeniy has moved	14 years ago
w1_netlink.c	MAINTAINERS: Evgeniy has moved	14 years ago
w1_netlink.h	MAINTAINERS: Evgeniy has moved	14 years ago