diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-04-25 02:59:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-04-25 02:59:16 -0400 |
commit | 3dbe927b1eddcbd66da1653168e33122aca84f4e (patch) | |
tree | 2357f4c55156597b1d07b9ea360b07086cd011e4 /Makefile | |
parent | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff) | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) |
Merge tag 'v3.4-rc4' into perf/core
Merge v3.4-rc4 - we were on -rc2 before.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 3 | 1 | VERSION = 3 |
2 | PATCHLEVEL = 4 | 2 | PATCHLEVEL = 4 |
3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
4 | EXTRAVERSION = -rc2 | 4 | EXTRAVERSION = -rc4 |
5 | NAME = Saber-toothed Squirrel | 5 | NAME = Saber-toothed Squirrel |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |