diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 16:18:46 +0100 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 16:18:46 +0100 |
| commit | 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 (patch) | |
| tree | fadde2521591998dc653fa094c636e8a547e620d /Makefile | |
| parent | 1dd2980d990068e20045b90c424518cc7f3657ff (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into perf/core
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.
Conflicts:
tools/perf/util/probe-event.c (trivial)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 33 -EXTRAVERSION = -rc5 +EXTRAVERSION = NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |