Merge branch 'master' of git://dev.medozas.de/linux

2011-01-18 16:20:53 +01:00
parent 94b27cc361 0b8ad87627
commit a8fc0d9b34
36 changed files with 133 additions and 125 deletions
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@ -56,6 +56,8 @@ header-y += xt_rateest.h
 header-y += xt_realm.h
 header-y += xt_recent.h
 header-y += xt_sctp.h
+header-y += xt_secmark.h
+header-y += xt_socket.h
 header-y += xt_state.h
 header-y += xt_statistic.h
 header-y += xt_string.h