From: Olof Johansson <olof@lixom.net>
Date: Tue, 17 Jan 2012 06:45:42 +0000 (-0800)
Subject: Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bbc390a6f275a7405a235b40b00ca0015a5cdb5b;p=deliverable%2Flinux.git

Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes

* 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji:
  ARM: picoxcell: fix sched_clock() cleanup fallout
---

bbc390a6f275a7405a235b40b00ca0015a5cdb5b