linux/net/netfilter/ipset
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
..
ip_set_bitmap_ip.c netfilter: ipset: add xt_action_param to the variant level kadt functions, ipset API change 2011-06-16 18:56:47 +02:00
ip_set_bitmap_ipmac.c netfilter: ipset: whitespace and coding fixes detected by checkpatch.pl 2011-06-16 19:01:26 +02:00
ip_set_bitmap_port.c netfilter: ipset: add xt_action_param to the variant level kadt functions, ipset API change 2011-06-16 18:56:47 +02:00
ip_set_core.c netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
ip_set_getport.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
ip_set_hash_ip.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_hash_ipport.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_hash_ipportip.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_hash_ipportnet.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_hash_net.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_hash_netiface.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_hash_netport.c netfilter: ipset: hash:net,iface fixed to handle overlapping nets behind different interfaces 2011-07-21 12:06:18 +02:00
ip_set_list_set.c netfilter: ipset: add xt_action_param to the variant level kadt functions, ipset API change 2011-06-16 18:56:47 +02:00
Kconfig netfilter: ipset: hash:net,iface type introduced 2011-06-16 19:00:48 +02:00
Makefile netfilter: ipset: hash:net,iface type introduced 2011-06-16 19:00:48 +02:00
pfxlen.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00