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		2011-11-06 19:44:47 -08:00
..
auth_gss.h
auth.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
bc_xprt.h	SUNRPC: sunrpc should not explicitly depend on NFS config options	2011-07-15 09:12:23 -04:00
cache.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
clnt.h	Merge branch 'osd-devel' into nfs-for-next	2011-11-02 23:56:40 -04:00
debug.h
gss_api.h	NFS: Determine initial mount security	2011-03-24 13:52:42 -04:00
gss_asn1.h
gss_err.h
gss_krb5_enctypes.h	nfsd: fix dependency of nfsd on auth_rpcgss	2011-06-06 15:07:15 -04:00
gss_krb5.h
Kbuild
metrics.h
msg_prot.h	SUNRPC: Support for RPC over AF_LOCAL transports	2011-05-27 17:42:47 -04:00
rpc_pipe_fs.h	SUNRPC/NFS: make rpc pipe upcall generic	2011-10-18 09:08:12 -07:00
rpc_rdma.h
sched.h	SUNRPC: Allow caller of rpc_sleep_on() to select priority levels	2011-07-17 18:11:34 -04:00
stats.h
svc_rdma.h
svc_xprt.h	include: replace linux/module.h with "struct module" wherever possible	2011-10-31 19:32:32 -04:00
svc.h	Merge branch 'osd-devel' into nfs-for-next	2011-11-02 23:56:40 -04:00
svcauth_gss.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
svcauth.h
svcsock.h	SUNRPC: Don't wait for full record to receive tcp data	2011-04-07 14:36:40 -04:00
timer.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
types.h
xdr.h	SUNRPC: introduce xdr_init_decode_pages	2011-05-29 20:52:32 +03:00
xprt.h	SUNRPC: Replace xprt->resend and xprt->sending with a priority queue	2011-07-17 18:11:34 -04:00
xprtrdma.h
xprtsock.h