diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-29 10:24:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-29 10:24:51 +0200 |
| commit | f7cf5eabfb836cfe7805dbed2173e14be1d85346 (patch) | |
| tree | 918554c3663c4e5904a9bf121925028b4c48c7e7 /Makefile | |
| parent | a751eae15f74649760465891f9878fa5e6a73d53 (diff) | |
| parent | 899611ee7d373e5eeda08e9a8632684e1ebbbf00 (diff) | |
Merge branch 'linus' into auto-latest
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 = 36 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Sheep on Meth # *DOCUMENTATION* |