diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-25 10:59:56 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-25 10:59:56 +0100 |
| commit | 669d6ece85f7750c01803662c8d8d3db8f726361 (patch) | |
| tree | 7f51fdc0274ff3c2da0ffb309d77f6158ff0dc0a /Makefile | |
| parent | 5f0028625b529f647e747d043ebde087be60e5b7 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
| download | lwn-669d6ece85f7750c01803662c8d8d3db8f726361.tar.gz lwn-669d6ece85f7750c01803662c8d8d3db8f726361.zip | |
Merge branch 'linus' into rt/head
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 = 33 -EXTRAVERSION = -rc8-rt +EXTRAVERSION = -rt NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |