]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28faa97 e550dfb)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2008 02:28:03 +0000 (19:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2008 02:28:03 +0000 (19:28 -0700)
1  2 
net/xfrm/xfrm_policy.c patch | diff1 | diff2 | blob | history

diff --cc net/xfrm/xfrm_policy.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.