Merge branch 'linus' into tracing/ftrace

This commit is contained in:
Ingo Molnar
2008-06-23 11:11:42 +02:00
284 changed files with 9946 additions and 5481 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
EXTRAVERSION = -rc6
EXTRAVERSION = -rc7
NAME = Rotary Wombat
# *DOCUMENTATION*