diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 09:09:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 09:09:51 +0200 |
| commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch) | |
| tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 /Makefile | |
| parent | ab7476cf76e560f0efda2a631a70aabe93009025 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.tar.gz linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.tar.bz2 linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.zip | |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc6 NAME = Rotary Wombat # *DOCUMENTATION* |