]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 123b973 9291747)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Feb 2011 23:24:48 +0000 (15:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Feb 2011 23:24:48 +0000 (15:24 -0800)
1  2 
net/netfilter/nf_conntrack_netlink.c patch | diff1 | diff2 | blob | history

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge
Andy's Linux Kernel repo