tree 409ed34476208f714e0d4c529a642d8fd21feaa5
parent a6b49cb210f878709bdc0bddc16a853f18790d02
parent 96830a57de1197519b62af6a4c9ceea556c18c3d
author Linus Torvalds <torvalds@linux-foundation.org> 1253808264 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253808264 -0700

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