diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-23 16:09:27 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-23 16:09:27 (GMT) |
| commit | 1f6d80358dc9bbbeb56cb43384fa11fd645d9289 (patch) | |
| tree | 152bfa5165292a8e4f06d536b6d222a68480e573 /Makefile | |
| parent | a2aeb02a8e6a9fef397c344245a54eeae67341f6 (diff) | |
| parent | 98f75b8291a89ba6bf73e322ee467ce0bfeb91c1 (diff) | |
| download | linux-1f6d80358dc9bbbeb56cb43384fa11fd645d9289.tar.xz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 17 SUBLEVEL = 0 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc6 NAME = Shuffling Zombie Juror # *DOCUMENTATION* |