linux/net/bridge
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
netfilter net, netfilter: Remove redundant goto in ebt_ulog_packet 2011-07-21 14:02:17 +02:00
br_device.c bridge: Always flood broadcast packets 2011-07-05 18:39:39 -07:00
br_fdb.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_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 bridge: notifier called with the wrong device 2011-07-22 17:01:12 -07:00
br_input.c bridge: Always flood broadcast packets 2011-07-05 18:39:39 -07: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: Only flood unregistered groups to routers 2011-06-24 17:52:51 -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: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_notify.c bridge: convert br_features_recompute() to ndo_fix_features 2011-04-28 13:33:08 -07:00
br_private_stp.h bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_private.h bridge: send proper message_age in config BPDU 2011-07-22 17:01:12 -07:00
br_stp_bpdu.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_stp_if.c bridge: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_stp_timer.c bridge: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_stp.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_sysfs_br.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_sysfs_if.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07: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