Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2012 06:45:42 +0000 (22:45 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2012 06:45:42 +0000 (22:45 -0800)
* 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji:
  ARM: picoxcell: fix sched_clock() cleanup fallout


Trivial merge