Merge branch 'master' of github.com:ngiordano/ics_3.1.10

ngiordano · Mar 30, 2012 · 325274a · 325274a
2 parents 77f56f0 + e85deba
commit 325274a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/arch/arm/configs/aries_captivatemtd_defconfig b/arch/arm/configs/aries_captivatemtd_defconfig
@@ -36,7 +36,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-TeamICSSGS"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y

diff --git a/arch/arm/configs/aries_galaxysbmtd_defconfig b/arch/arm/configs/aries_galaxysbmtd_defconfig
@@ -36,7 +36,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-TeamICSSGS"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y

diff --git a/arch/arm/configs/aries_galaxysmtd_defconfig b/arch/arm/configs/aries_galaxysmtd_defconfig
@@ -36,7 +36,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-TeamICSSGS"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y