tree e5ea2f802e778c4ad6e343ea344992a20076dd70
parent ad1fca2003822ff2f24c88ad68a29970c5e0d0a7
parent 6350323ad8def2ac00d77cdee3b79c9b9fba75c4
author Linus Torvalds <torvalds@linux-foundation.org> 1324681075 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1324681075 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  netfilter: xt_connbytes: handle negation correctly
  net: relax rcvbuf limits
  rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
  net: introduce DST_NOPEER dst flag
  mqprio: Avoid panic if no options are provided
  bridge: provide a mtu() method for fake_dst_ops