diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-24 15:08:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-24 15:08:26 -0500 |
| commit | db8862eafe8a5d030a3b02e81b8bb47447c315e3 (patch) | |
| tree | 073ea7b46809bf804134cbf008a593413c02a99c /Makefile | |
| parent | c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9 (diff) | |
| parent | c20137fc5329eaf24093fc48c52608dc66be8e5c (diff) | |
Merge branch 'linus' into tracing/hw-branch-tracing
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 = 28 | 3 | SUBLEVEL = 28 |
| 4 | EXTRAVERSION = -rc8 | 4 | EXTRAVERSION = -rc9 |
| 5 | NAME = Erotic Pickled Herring | 5 | NAME = Erotic Pickled Herring |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |