forked from luck/tmp_suning_uos_patched
32aaeffbd4
* '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
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| bast-ide.c | ||
| bast-irq.c | ||
| cpu-freq.c | ||
| dma.c | ||
| h1940-bluetooth.c | ||
| Kconfig | ||
| mach-amlm5900.c | ||
| mach-bast.c | ||
| mach-h1940.c | ||
| mach-n30.c | ||
| mach-otom.c | ||
| mach-qt2410.c | ||
| mach-smdk2410.c | ||
| mach-tct_hammer.c | ||
| mach-vr1000.c | ||
| Makefile | ||
| Makefile.boot | ||
| nor-simtec.c | ||
| nor-simtec.h | ||
| pll.c | ||
| pm-h1940.S | ||
| pm.c | ||
| s3c2410.c | ||
| sleep.S | ||
| usb-simtec.c | ||
| usb-simtec.h | ||