diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /Makefile | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 3 | 2 | PATCHLEVEL = 4 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc2 | 4 | EXTRAVERSION = -rc2 |
| 5 | NAME = Saber-toothed Squirrel | 5 | NAME = Saber-toothed Squirrel |
| @@ -1172,7 +1172,7 @@ MRPROPER_FILES += .config .config.old .version .old_version \ | |||
| 1172 | # | 1172 | # |
| 1173 | clean: rm-dirs := $(CLEAN_DIRS) | 1173 | clean: rm-dirs := $(CLEAN_DIRS) |
| 1174 | clean: rm-files := $(CLEAN_FILES) | 1174 | clean: rm-files := $(CLEAN_FILES) |
| 1175 | clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation) | 1175 | clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples) |
| 1176 | 1176 | ||
| 1177 | PHONY += $(clean-dirs) clean archclean | 1177 | PHONY += $(clean-dirs) clean archclean |
| 1178 | $(clean-dirs): | 1178 | $(clean-dirs): |