projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a06597 49688c8)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 14 Apr 2007 01:20:16 +0000 (18:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 14 Apr 2007 01:20:16 +0000 (18:20 -0700)
commit2918cd81f58aa9748acf961240c006394f474047
treec50c63a99c70766d83c561d018ffe29b775c0e53tree | snapshot
parent8a065975c1c00d1ab3293c1adf6f89988bb1b03bcommit | diff
parent49688c843101ba6275756505e81af45ef50f87d7commit | diff
Merge /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
John Crispins staging tree