diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-04 03:03:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-04 03:09:12 +0100 |
| commit | f188b951f33a0464338f94f928338f84fc0e4392 (patch) | |
| tree | 17ad63719242b1de0266627a1dc92ba869a3ba4e /lib/.gitignore | |
| parent | mlxsw: core: Change BUG to WARN in hwmon code (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-f188b951f33a0464338f94f928338f84fc0e4392.tar.xz linux-f188b951f33a0464338f94f928338f84fc0e4392.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/renesas/ravb_main.c
kernel/bpf/syscall.c
net/ipv4/ipmr.c
All three conflicts were cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/.gitignore')
0 files changed, 0 insertions, 0 deletions