From: Arnd Bergmann Date: Wed, 25 Jul 2012 12:33:45 +0000 (+0200) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... X-Git-Tag: firefly_0821_release~3680^2~2260^2~10 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8cef081c71dd4e16a01a1e63cedab21eef8b5735;p=firefly-linux-kernel-4.4.55.git Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into fixes The merge of the 'clk-for-linus' branch caused an automated merge failure. Pull that in here so we can fix the problem. Signed-off-by: Arnd Bergmann --- 8cef081c71dd4e16a01a1e63cedab21eef8b5735