]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit22d55328b7d27694718f5d64a53d2bddbbe173a5
tree9bb8ecd03fadca07b5887006fbd59ddaa0114bf1
parent3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123
parentd5654efd3ff1cd0baa935a0c9a5d89862f07d009
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
net/xfrm/xfrm_policy.c