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)
commitbbc390a6f275a7405a235b40b00ca0015a5cdb5b
tree56b4e78a0c2f6c30a0d793a8abde460cc79bda11
parentc2bc3a316a7281f67e36b34dac2802cbe36a9128
parent6b2a05584c5939eba24d22037dcb4cc71e5345e5
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