From a114aec841917e728e121301f3c2d17ecb0b6edd Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Mon, 30 May 2011 13:36:07 +0200
Subject: [PATCH] --- yaml --- r: 253356 b: refs/heads/master c:
 cacd54ef49b75cb31d78bb7b8dd900690aac7bdf h: refs/heads/master v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4dcde4859da3..ed2259c3e161 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 181e976327cf33095837c579608ebed42d2ad992
+refs/heads/master: cacd54ef49b75cb31d78bb7b8dd900690aac7bdf
diff --git a/trunk/Makefile b/trunk/Makefile
index afb8e0d26f2c..4fe907510d79 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
-KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
 
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC