diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-22 18:03:00 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-22 18:03:00 -0400 |
| commit | 8400146d0dc03590bba051399e4bb7e1cbf1c010 (patch) | |
| tree | 4c0c88273ff31e5e5f51c10d8727acab460b57ec /Makefile | |
| parent | 39cf0518d89d1f0af79554457c52adb5b12fa43c (diff) | |
| parent | 3edf2fb9d80a46d6c32ba12547a42419845b4b76 (diff) | |
Merge branch 'master' into for-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 = 31 | 3 | SUBLEVEL = 31 |
| 4 | EXTRAVERSION = -rc6 | 4 | EXTRAVERSION = -rc7 |
| 5 | NAME = Man-Eating Seals of Antiquity | 5 | NAME = Man-Eating Seals of Antiquity |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |