From: Olof Johansson 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-Tag: firefly_0821_release~3680^2~3670^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bbc390a6f275a7405a235b40b00ca0015a5cdb5b;p=firefly-linux-kernel-4.4.55.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