diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-08-03 11:04:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-08-03 11:04:34 +0200 |
| commit | c88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436 (patch) | |
| tree | 9e9d53b10f705b6b6b5eaf178a90a21779b3d6d7 /Makefile | |
| parent | cd4e15ad91d24bdffc6c4cb5f05be916154229a3 (diff) | |
| parent | 15b059e0f9e31f0e7f6b5397368054c005949fea (diff) | |
| download | lwn-c88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436.tar.gz lwn-c88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436.zip | |
Merge stable update
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
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 = .6-rt28 +EXTRAVERSION = .7-rt28 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |