]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 May 2010 06:12:18 +0000 (23:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 May 2010 06:12:18 +0000 (23:12 -0700)
commit41499bd6766314079417d1467c466d31b8612fec
tree5ce777cd47603977ee55059891c67b8a420e05a1
parent622e0ca1cd4d459f5af4f2c65f4dc0dd823cb4c3
parent7ea7b858f4bc4fa1645f1327cf9e72c93981aa58
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6