diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-11-23 16:37:21 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-11-23 16:37:21 -0500 |
| commit | 4e794663a5b3bc651eee483722e5829473078da1 (patch) | |
| tree | 029af10f1bc1ad71d58b9542828fe012a62c2866 /Makefile | |
| parent | 39ac0fa3408fa9ac131b8ff8549e470734cdb89f (diff) | |
| parent | bf6ef02e53e18dd14798537e530e00b80435ee86 (diff) | |
Merge commit 'v2.6.36.1' into linaro-2.6.36
Conflicts:
arch/arm/mach-cns3xxx/include/mach/debug-macro.S
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 = 36 -EXTRAVERSION = +EXTRAVERSION = .1 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION* |