]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3433f3 f9181f4)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 20:49:24 +0000 (13:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 20:49:24 +0000 (13:49 -0700)
1  2 
net/bridge/br_netfilter.c patch | diff1 | diff2 | blob | history
net/netfilter/nfnetlink_log.c patch | diff1 | diff2 | blob | history
net/netfilter/nfnetlink_queue.c patch | diff1 | diff2 | blob | history

diff --cc net/bridge/br_netfilter.c
Simple merge
diff --cc net/netfilter/nfnetlink_log.c
Simple merge
diff --cc net/netfilter/nfnetlink_queue.c
Simple merge
Clone of davem's net-next-2.6 tree