diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-04 16:02:49 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-04 16:02:49 +0200 |
| commit | 053b4b64b95efb8760ce54d205f7263f9614ac4b (patch) | |
| tree | d2621f332b08c54992293f93b2f75371504a9603 /Makefile | |
| parent | e16b722e56eac3f2ef9e6d7fb5b2df19b22316d6 (diff) | |
| parent | 2147b209180701193e4a154896494aeeeab9d268 (diff) | |
| download | lwn-053b4b64b95efb8760ce54d205f7263f9614ac4b.tar.gz lwn-053b4b64b95efb8760ce54d205f7263f9614ac4b.zip | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.y
into rt/2.6.31
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 = 31 -EXTRAVERSION = -rt11 +EXTRAVERSION =.1 -rt11 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |