diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-13 03:57:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-13 03:57:10 -0400 |
| commit | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (patch) | |
| tree | a2c186cb828e3713c2ec48a4d7191166fb798b3d /Makefile | |
| parent | 659c36fcda403013a01b85da07cf2d9711e6d6c7 (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge tag 'v3.4-rc2' into perf/core
Merge Linux 3.4-rc2: we were on v3.3, update the base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 3 | 2 | PATCHLEVEL = 4 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = | 4 | EXTRAVERSION = -rc2 |
| 5 | NAME = Saber-toothed Squirrel | 5 | NAME = Saber-toothed Squirrel |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -1170,7 +1170,7 @@ MRPROPER_FILES += .config .config.old .version .old_version \ | |||
| 1170 | # | 1170 | # |
| 1171 | clean: rm-dirs := $(CLEAN_DIRS) | 1171 | clean: rm-dirs := $(CLEAN_DIRS) |
| 1172 | clean: rm-files := $(CLEAN_FILES) | 1172 | clean: rm-files := $(CLEAN_FILES) |
| 1173 | clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation) | 1173 | clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples) |
| 1174 | 1174 | ||
| 1175 | PHONY += $(clean-dirs) clean archclean | 1175 | PHONY += $(clean-dirs) clean archclean |
| 1176 | $(clean-dirs): | 1176 | $(clean-dirs): |