linux/net/bridge
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
..
netfilter netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
Kconfig net: bridge builtin vs. ipv6 modular 2011-03-10 13:45:57 -08:00
Makefile bridge: Add core IGMP snooping support 2010-02-28 00:48:45 -08:00
br.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07:00
br_device.c Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
br_fdb.c bridge: allow updating existing fdb entries 2011-10-03 12:17:33 -04:00
br_forward.c net: bridge: check the length of skb after nf_bridge_maybe_copy_header() 2011-01-06 11:33:05 -08:00
br_if.c Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
br_input.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
br_ioctl.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-04-11 13:44:25 -07:00
br_multicast.c bridge: fix a possible use after free 2011-08-24 17:49:24 -07:00
br_netfilter.c net: Add ->neigh_lookup() operation to dst_ops 2011-07-18 00:40:17 -07:00
br_netlink.c bridge: fix hang on removal of bridge via netlink 2011-10-18 23:24:16 -04:00
br_notify.c Bridge: Always send NETDEV_CHANGEADDR up on br MAC change. 2011-08-09 21:44:44 -07:00
br_private.h Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
br_private_stp.h bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_stp.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_stp_bpdu.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_stp_if.c net: fix implicit kmod.h usage in bridge/br_stp_if.c 2011-10-31 19:30:30 -04:00
br_stp_timer.c bridge: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_sysfs_br.c bridge: allow forwarding some link local frames 2011-10-06 15:27:56 -04:00
br_sysfs_if.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00