diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-07 20:20:02 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-07 20:20:02 (GMT) |
| commit | 43b18db8a27fcd28c2bd290adf031ca04ea573ce (patch) | |
| tree | b9159b5319822a962edb018b651e5be69d72f542 /fs | |
| parent | 8b4cd8a0535706ab3f47dd52f5650b11152080b3 (diff) | |
| parent | 9df9e7832391cf699abbf39fc8d95d7e78297462 (diff) | |
| download | linux-fsl-qoriq-43b18db8a27fcd28c2bd290adf031ca04ea573ce.tar.xz | |
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>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions