Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 10 Sep 2008 02:28:03 +0000 (19:28 -0700)]
1  2 
net/xfrm/xfrm_policy.c

Simple merge