diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 10:01:34 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 10:01:34 +0100 |
| commit | bb9074ff58fe745e4f244f76209241909c82ec9c (patch) | |
| tree | cf6be00ab88b1e315f6b74a896a370440f677599 /Makefile | |
| parent | sysctl: Remove the last of the generic binary sysctl support (diff) | |
| parent | Linux 2.6.32-rc7 (diff) | |
| download | linux-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.xz linux-bb9074ff58fe745e4f244f76209241909c82ec9c.zip | |
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc7 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |