Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index c2735fa..72f0585 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 VERSION = 0
 PATCHLEVEL = 5
 SUBLEVEL = 9
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME = Cilonen
 
 TOOLS ?= $(CONFIG_TOOLS)