diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-27 11:11:07 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-27 11:11:07 +0200 |
| commit | 846bcf3923056965c3fc0c9ba811c10d25af75e5 (patch) | |
| tree | c39bd4273a006da2fb1f727ebb7eb1108f5526c8 /Makefile | |
| parent | 863c3ad87b10617464fc52c21fc7e31987910559 (diff) | |
| parent | 3e7ad8ed979ce9e3ad897dd87c50bf577966f89c (diff) | |
| download | lwn-846bcf3923056965c3fc0c9ba811c10d25af75e5.tar.gz lwn-846bcf3923056965c3fc0c9ba811c10d25af75e5.zip | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
into rt/2.6.33
Conflicts:
Makefile
arch/x86/include/asm/rwsem.h
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 = .2-rt13 +EXTRAVERSION = .3-rt13 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |