projects / unionfs-2.6.39.y.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 904e373) | patch
kernel/sysctl.c: fix stable merge error in NOMMU mmap_min_addr
authorMike Frysinger <vapier@gentoo.org>
Fri, 8 Jan 2010 05:40:42 +0000 (00:40 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 18 Jan 2010 18:19:49 +0000 (10:19 -0800)
commit71c77079a7b5c22e01eba239f93ce38bd6126725
treeeb6bb0f65cb7bb2139d0130e90376b5e9a6f7c96tree | snapshot
parent904e3733fd1c50e81f4726f56759343207874a95commit | diff
kernel/sysctl.c: fix stable merge error in NOMMU mmap_min_addr

Stable commit 0399123f3dcce1a515d021107ec0fb4413ca3efa didn't match the
original upstream commit.  The CONFIG_MMU check was added much too early
in the list disabling a lot of proc entries in the process.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/sysctl.c diff | blob | history
unionfs2-2.6.39.y