tree c50c63a99c70766d83c561d018ffe29b775c0e53
parent 8a065975c1c00d1ab3293c1adf6f89988bb1b03b
parent 49688c843101ba6275756505e81af45ef50f87d7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1176513616 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1176513616 -0700

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