mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 12:10:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linus' into perf/core

Browse Source 
Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2010-06-28 22:33:13 +02:00
parent 9a15a07fe2 5904b3b81d
commit f384c954c9
268 changed files with 2056 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
localver-extra = $(scm-identifier)
else
ifneq ($(scm-identifier),)
ifeq ($(LOCALVERSION),)
ifeq ("$(origin LOCALVERSION)", "undefined")
localver-extra = +
endif
endif