diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-09 20:43:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-09 20:43:21 -0500 |
| commit | 6a46ff87d4b1d68814145c757b8a9199c625d840 (patch) | |
| tree | 5787aeb847f8d3c9e1a6fd2ba0e4ff2976ca47e0 /arch/powerpc/kernel/time.c | |
| parent | 66e56cd46b93ef407c60adcac62cf33b06119d50 (diff) | |
| parent | cf9dc09d0949f0b5953fb08caa10bba0dc7ee71f (diff) | |
| download | talos-op-linux-6a46ff87d4b1d68814145c757b8a9199c625d840.tar.gz talos-op-linux-6a46ff87d4b1d68814145c757b8a9199c625d840.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains three Netfilter fixes for your net tree,
they are:
* fix incorrect comparison in the new netnet hash ipset type, from
Dave Jones.
* fix splat in hashlimit due to missing removal of the content of its
proc entry in netnamespaces, from Sergey Popovich.
* fix missing rule flushing operation by table in nf_tables. Table
flushing was already discussed back in October but this got lost and
no patch has hit the tree to address this issue so far, from me.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
0 files changed, 0 insertions, 0 deletions
