From: Arnd Bergmann Date: Tue, 19 Mar 2013 21:59:54 +0000 (+0100) Subject: Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform X-Git-Tag: firefly_0821_release~3680^2~604^2~16^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8016f1eac1ff7162130f253a41099386558ebc1;p=firefly-linux-kernel-4.4.55.git Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform --- f8016f1eac1ff7162130f253a41099386558ebc1