diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
tree | f4421227b3065e786c9041cf0ce0073a249e011b /Makefile | |
parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) |
Auto merge with /home/aegl/GIT/linus
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 = 12 | 3 | SUBLEVEL = 12 |
4 | EXTRAVERSION =-rc6 | 4 | EXTRAVERSION = |
5 | NAME=Woozy Numbat | 5 | NAME=Woozy Numbat |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |