]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c01ae81 1da05f5)
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
Unnamed repository; edit this file 'description' to name the repository.