diff options
author | 2015-03-23 22:22:43 -0400 | |
---|---|---|
committer | 2015-03-23 22:22:43 -0400 | |
commit | d5c1d8c567781932e3ab2c62e8fcfee0283d9580 (patch) | |
tree | c04fca1719409426b42af6a7caa75cc26ba940a9 /CREDITS | |
parent | rhashtable: Fix sleeping inside RCU critical section in walk_stop (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.tar.xz linux-dev-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/netfilter/nf_tables_core.c
The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions