diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 20:02:18 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 20:02:18 -0400 |
| commit | 9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch) | |
| tree | 569b5a13b3f7030a603460d8d9ded035a6f7f48f /Makefile | |
| parent | 897493504addc5609f04a2c4f73c37ab972c29b2 (diff) | |
| parent | 49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
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 = 36 | 3 | SUBLEVEL = 36 |
| 4 | EXTRAVERSION = -rc3 | 4 | EXTRAVERSION = -rc4 |
| 5 | NAME = Sheep on Meth | 5 | NAME = Sheep on Meth |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |