| commit | 155d4551bd0ab04367f4ca4e0a229774497da4d8 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 23 Dec 2011 22:57:55 +0000 (23 14:57 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 23 Dec 2011 22:57:55 +0000 (23 14:57 -0800) | ||
| tree | e5ea2f802e778c4ad6e343ea344992a20076dd70 | treesnapshot (tar.gz zip) |
| parent | ad1fca2003822ff2f24c88ad68a29970c5e0d0a7 | commitdiff |
| parent | 6350323ad8def2ac00d77cdee3b79c9b9fba75c4 | commitdiff |
Merge git://git./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
* 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