projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0b0268 e3eaa99)
Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 16:56:46 +0000 (17:56 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 16:56:46 +0000 (17:56 +0100)
1  2 
include/linux/netfilter/x_tables.h patch | diff1 | diff2 | blob | history
net/netfilter/x_tables.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/netfilter/x_tables.h
Simple merge
diff --cc net/netfilter/x_tables.c
Simple merge