diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-15 03:26:41 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 03:26:41 +0400 |
| commit | 47fb3a26e2f07a734876915bedc1053021fec860 (patch) | |
| tree | 8921f299d57a6c875c835d0b9db22fcf50089032 /include/sound | |
| parent | 5dbbaf2de89613d19a9286d4db0a535ca2735d26 (diff) | |
| parent | 5b76c4948fe6977bead2359c2054f3e6a2dcf3d0 (diff) | |
| download | linux-47fb3a26e2f07a734876915bedc1053021fec860.tar.xz | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following patchset contains netfilter fixes for 3.8-rc3,
they are:
* fix possible BUG_ON if several netns are in use and the nf_conntrack
module is removed, initial patch from Gao feng, final patch from myself.
* fix unset return value if conntrack zone are disabled at
compile-time, reported by Borislav Petkov, fix from myself.
* fix display error message via dmesg for arp_tables, from Jan Engelhardt.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/sound')
0 files changed, 0 insertions, 0 deletions