| commit | d5c1d8c567781932e3ab2c62e8fcfee0283d9580 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Mar 23 22:22:43 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon Mar 23 22:22:43 2015 -0400 |
| tree | c04fca1719409426b42af6a7caa75cc26ba940a9 | |
| parent | ba7c95ea3870fe7b847466d39a049ab6f156aa2c [diff] | |
| parent | 90a5a895cc8b284ac522757a01de15e36710c2b9 [diff] |
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>