diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-13 21:20:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-13 21:20:35 +0200 |
| commit | 795ee62f0dd24d6a4c163dbd6caffaf648193447 (patch) | |
| tree | 6b6855a1694d4da295373683c7e39e69eaac521e /Makefile | |
| parent | c2171f666fbd581bb18ed0b5d7a5270a4c931364 (diff) | |
| parent | 5eee394f24eca7d1f670ddc9d08a8d02c90e74ca (diff) | |
| download | lwn-795ee62f0dd24d6a4c163dbd6caffaf648193447.tar.gz lwn-795ee62f0dd24d6a4c163dbd6caffaf648193447.zip | |
Merge 2.6.31.4
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 =.3-rt13 +EXTRAVERSION =.4-rt13 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |