diff --git a/[refs] b/[refs] index 354c534dba4a..a196252b7ac4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb8dc5e7b58bfe56aa91bcc501b62f214bb401e8 +refs/heads/master: 2e01e00e768ef42fb5b8804cd1b9b47b26d59ec5 diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt index 194c8f351320..0b1b0c008613 100644 --- a/trunk/Documentation/filesystems/proc.txt +++ b/trunk/Documentation/filesystems/proc.txt @@ -216,6 +216,7 @@ Table 1-3: Contents of the stat files (as of 2.6.22-rc3) priority priority level nice nice level num_threads number of threads + it_real_value (obsolete, always 0) start_time time the process started after system boot vsize virtual memory size rss resident set memory size