]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11dd048 244a1c3)
Merge branch 'master' of ../nf-2.6
authorPatrick McHardy <kaber@trash.net>
Thu, 18 Mar 2010 11:55:50 +0000 (12:55 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 18 Mar 2010 11:55:50 +0000 (12:55 +0100)
1  2 
net/bridge/netfilter/ebt_ip6.c patch | diff1 | diff2 | blob | history

diff --cc net/bridge/netfilter/ebt_ip6.c
Simple merge
Linux Kernel Source Tree.