diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-08 09:27:06 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-08 09:27:06 +0200 |
| commit | 439f3e1a99acaf9c5886a496788ad833b0155c42 (patch) | |
| tree | 4b6027a59675a0bd3b77c5c7fee2a71b16f65207 /Makefile | |
| parent | 71c5e15c6854b8dd422591f041aee9597cc2b918 (diff) | |
| parent | 8adec3b28d288381d5e001dbb49b908c132b2909 (diff) | |
| download | lwn-439f3e1a99acaf9c5886a496788ad833b0155c42.tar.gz lwn-439f3e1a99acaf9c5886a496788ad833b0155c42.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 =.2-rt13 +EXTRAVERSION =.3-rt13 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |