]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Sep 2009 16:04:24 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Sep 2009 16:04:24 +0000 (09:04 -0700)
commit7ca263cdf8cf74d0f1c6f48d07d556de92e3bec9
tree409ed34476208f714e0d4c529a642d8fd21feaa5
parenta6b49cb210f878709bdc0bddc16a853f18790d02
parent96830a57de1197519b62af6a4c9ceea556c18c3d
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