| commit | 00c1bd54d8c7b6210530cdbb3508125a0bf4a32b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Dec 01 15:45:30 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Dec 01 15:45:30 2005 -0800 |
| tree | df4268371b3f1f00cce53247a7871d70e5cf4955 | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b [diff] | |
| parent | 220ec706645ecf13ee3a87046d17316303905698 [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
diff --git a/Makefile b/Makefile index 5187fee..4643d57 100644 --- a/Makefile +++ b/Makefile
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 15 -EXTRAVERSION =-rc3 +EXTRAVERSION =-rc4 NAME=Affluent Albatross # *DOCUMENTATION*