diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-10 12:39:06 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-11-10 12:39:06 +0100 |
| commit | 7d2878572270784070ef29870e75fef0c2046946 (patch) | |
| tree | 9013e5136a2cec66c85e51842bb911b2e0c4ce53 /Makefile | |
| parent | 0902912a2ab175ac7b4c633b5f0de946e24ce590 (diff) | |
| parent | 120f68c426e746771e8c09736c0f753822ff3f52 (diff) | |
| download | lwn-7d2878572270784070ef29870e75fef0c2046946.tar.gz lwn-7d2878572270784070ef29870e75fef0c2046946.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 =.5-rt18 +EXTRAVERSION =.6-rt18 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |