| commit | 1f6d80358dc9bbbeb56cb43384fa11fd645d9289 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Sep 23 12:09:27 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Sep 23 12:09:27 2014 -0400 |
| tree | 152bfa5165292a8e4f06d536b6d222a68480e573 | |
| parent | a2aeb02a8e6a9fef397c344245a54eeae67341f6 [diff] | |
| parent | 98f75b8291a89ba6bf73e322ee467ce0bfeb91c1 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>