commit 49457896d522db195a0fd6b273e5ce4c3b186c6a
author Rob Landley <rob@landley.net> Tue Dec 31 22:34:04 2013 -0600
committer Jiri Kosina <jkosina@suse.cz> Thu Jan 02 10:53:04 2014 +0100
tree 5d43602f8b1fa6e08ecb9436d77291fc381ce40d
parent 6e641c943fd5355592b7b955fe3d0f07c927a0aa

Documentation: update /proc/uptime field description

/proc/uptime has two fields, update description to describe both
ala http://lkml.indiana.edu/hypermail/linux/kernel/1312.3/01454.html

Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Documentation/filesystems/proc.txt

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 22d89aa3..19e10ab 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -547,7 +547,7 @@
  sys         See chapter 2                                     
  sysvipc     Info of SysVIPC Resources (msg, sem, shm)		(2.4)
  tty	     Info of tty drivers
- uptime      System uptime                                     
+ uptime      Wall clock since boot, combined idle time of all cpus
  version     Kernel version                                    
  video	     bttv info of video resources			(2.4)
  vmallocinfo Show vmalloced areas