projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpi-bus', 'acpi-pci', 'acpica' and 'acpi-doc'
[cascardo/linux.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0d50489
..
66da9a3
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 4
PATCHLEVEL = 7
SUBLEVEL = 0
VERSION = 4
PATCHLEVEL = 7
SUBLEVEL = 0
-EXTRAVERSION =
-rc6
+EXTRAVERSION =
NAME = Psychotic Stoned Sheep
# *DOCUMENTATION*
NAME = Psychotic Stoned Sheep
# *DOCUMENTATION*