Merge tag 'v3.4-rc4' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Apr 2012 06:59:16 +0000 (08:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Apr 2012 06:59:16 +0000 (08:59 +0200)
Merge v3.4-rc4 - we were on -rc2 before.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
Makefile

diff --combined Makefile
index f7f7381171284c1b678127c28b47fd7b99835bf5,afc868e6c75dd26dbbf28c3511cbcf29c0471573..2280dff31b62fab631d1ca9e6407a1b5137e0be8
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 4
  SUBLEVEL = 0
- EXTRAVERSION = -rc2
+ EXTRAVERSION = -rc4
  NAME = Saber-toothed Squirrel
  
  # *DOCUMENTATION*
@@@ -1468,13 -1468,6 +1468,13 @@@ kernelrelease
  kernelversion:
        @echo $(KERNELVERSION)
  
 +# Clear a bunch of variables before executing the submake
 +tools/: FORCE
 +      $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/
 +
 +tools/%: FORCE
 +      $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ $*
 +
  # Single targets
  # ---------------------------------------------------------------------------
  # Single targets are compatible with: