From: Linus Torvalds Date: Sat, 9 Jun 2007 01:15:49 +0000 (-0700) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v2.6.22-rc5~58 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=81d84a94be8085475c3585596e52b06ccbedd922;p=linux-2.6-omap-h63xx.git Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine. [NetLabel]: consolidate the struct socket/sock handling to just struct sock [IPV4]: Do not remove idev when addresses are cleared --- 81d84a94be8085475c3585596e52b06ccbedd922