Skip to content
Commit 7ca263cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6:
  [PATCH] Fix idle time field in /proc/uptime
parents a6b49cb2 96830a57
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment