| commit | 7ca263cdf8cf74d0f1c6f48d07d556de92e3bec9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 24 09:04:24 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 24 09:04:24 2009 -0700 |
| tree | 409ed34476208f714e0d4c529a642d8fd21feaa5 | |
| parent | a6b49cb210f878709bdc0bddc16a853f18790d02 [diff] | |
| parent | 96830a57de1197519b62af6a4c9ceea556c18c3d [diff] |
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