Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Misc fixes: two EDAC driver fixes, a Xen crash fix, a HyperV log spam
  fix and a documentation fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86 EDAC, sb_edac.c: Take account of channel hashing when needed
  x86 EDAC, sb_edac.c: Repair damage introduced when "fixing" channel address
  x86/mm/xen: Suppress hugetlbfs in PV guests
  x86/doc: Correct limits in Documentation/x86/x86_64/mm.txt
  x86/hyperv: Avoid reporting bogus NMI status for Gen2 instances

1 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 0f59a51..49b189a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 VERSION = 0
 PATCHLEVEL = 5
 SUBLEVEL = 8
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME = Ziggomatic
 
 TOOLS ?= $(CONFIG_TOOLS)