diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:31:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:31:28 -0400 |
| commit | 8700600a74852d75eb965b969dcf9f58e2b32546 (patch) | |
| tree | 1490919076921ecc208bf667a8c2f8a7c5446854 /Makefile | |
| parent | b8e0418b2a25f975c3b8764030c24b7253d33a68 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/nmi
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 26 |
| 4 | EXTRAVERSION = -rc6 | 4 | EXTRAVERSION = -rc8 |
| 5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |