diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-25 13:17:01 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-25 13:17:01 +1000 |
commit | 5b3388a605ffc298f8ddce3a7ee3d2c405f0e9a8 (patch) | |
tree | 14c3bc8b78a204df66b876cf6050d74bf3900ac6 /init | |
parent | 43c510920ac95489b0bbfc3e393e3fb82227afd1 (diff) | |
parent | a52cad790b1c255c6b291a781b2514f7a1488be1 (diff) |
Merge commit 'kbuild/master'
Conflicts:
Makefile
include/Kbuild
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index a50bdfed2df7..43d6989c275f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -171,7 +171,7 @@ config BSD_PROCESS_ACCT_V3 process and it's parent. Note that this file format is incompatible with previous v0/v1/v2 file formats, so you will need updated tools for processing it. A preliminary version of these tools is available - at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>. + at <http://www.gnu.org/software/acct/>. config TASKSTATS bool "Export task/process statistics through netlink (EXPERIMENTAL)" @@ -486,7 +486,7 @@ config PID_NS default n depends on NAMESPACES && EXPERIMENTAL help - Suport process id namespaces. This allows having multiple + Support process id namespaces. This allows having multiple process with the same pid as long as they are in different pid namespaces. This is a building block of containers. |