| commit | 43b18db8a27fcd28c2bd290adf031ca04ea573ce | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Mar 07 15:20:02 2013 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Mar 07 15:20:02 2013 -0500 |
| tree | b9159b5319822a962edb018b651e5be69d72f542 | |
| parent | 8b4cd8a0535706ab3f47dd52f5650b11152080b3 [diff] | |
| parent | 9df9e7832391cf699abbf39fc8d95d7e78297462 [diff] |
Merge branch 'master' of git://1984.lsi.us.es/nf Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter fixes for your net tree, they are: * Don't generate audit log message if audit is not enabled, from Gao Feng. * Fix logging formatting for packets dropped by helpers, by Joe Perches. * Fix a compilation warning in nfnetlink if CONFIG_PROVE_RCU is not set, from Paul Bolle. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>