From: Linus Torvalds Date: Fri, 23 Dec 2011 22:57:55 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=155d4551bd0ab04367f4ca4e0a229774497da4d8;p=deliverable%2Flinux.git 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 --- 155d4551bd0ab04367f4ca4e0a229774497da4d8