diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-29 09:12:37 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-29 09:12:37 +0100 |
| commit | 7b724e6c828448ea82ba809204a53307cc235b0f (patch) | |
| tree | 386f9e56ae6d4ab89f93334730ac199bf0ded029 /Makefile | |
| parent | 346bf8916fbefb63e704a98198dd4ddd4d0ae090 (diff) | |
| parent | e2984cbfddd5c8fac88b24d7e5f28e1cfb6f3838 (diff) | |
| download | lwn-7b724e6c828448ea82ba809204a53307cc235b0f.tar.gz lwn-7b724e6c828448ea82ba809204a53307cc235b0f.zip | |
v2.6.31.5-rt16
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.y
into rt/2.6.31
Conflicts:
Makefile
kernel/futex.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 31 -EXTRAVERSION =.4-rt15 +EXTRAVERSION =.5-rt16 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* @@ -980,11 +980,6 @@ prepare0: archprepare FORCE # All the preparing.. prepare: prepare0 -# Leave this as default for preprocessing vmlinux.lds.S, which is now -# done in arch/$(ARCH)/kernel/Makefile - -export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) - # The asm symlink changes when $(ARCH) changes. # Detect this and ask user to run make mrproper # If asm is a stale symlink (point to dir that does not exist) remove it |