Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 08:29:24 +0000 (00:29 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 08:29:24 +0000 (00:29 -0800)
1  2 
net/xfrm/xfrm_policy.c

Simple merge