From: Linus Torvalds Date: Sat, 14 Apr 2007 01:20:16 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v2.6.21-rc7~11 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2918cd81f58aa9748acf961240c006394f474047;p=linux-2.6-omap-h63xx.git Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER] arp_tables: Fix unaligned accesses. [IPV6] SNMP: Fix {In,Out}NoRoutes statistics. [IPSEC] XFRM_USER: kernel panic when large security contexts in ACQUIRE [VLAN]: Allow VLAN interface on top of bridge interface [PKTGEN]: Add try_to_freeze() [NETFILTER]: ipt_ULOG: use put_unaligned --- 2918cd81f58aa9748acf961240c006394f474047