From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Sep 2009 16:04:24 +0000 (-0700)
Subject: Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: firefly_0821_release~12334
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ca263cdf8cf74d0f1c6f48d07d556de92e3bec9;p=firefly-linux-kernel-4.4.55.git

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

* 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6:
  [PATCH] Fix idle time field in /proc/uptime
---

7ca263cdf8cf74d0f1c6f48d07d556de92e3bec9