From: David S. Miller <davem@davemloft.net>
Date: Thu, 7 Mar 2013 20:20:02 +0000 (-0500)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Tag: v3.9-rc3~36^2~25
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=43b18db8a27fcd28c2bd290adf031ca04ea573ce

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>
---

43b18db8a27fcd28c2bd290adf031ca04ea573ce