From: Jiri Kosina Date: Sun, 28 Oct 2012 18:28:52 +0000 (+0100) Subject: Merge branch 'master' into for-next X-Git-Tag: firefly_0821_release~3680^2~631^2~99 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a;p=firefly-linux-kernel-4.4.55.git Merge branch 'master' into for-next Sync up with Linus' tree to be able to apply Cesar's patch against newer version of the code. Signed-off-by: Jiri Kosina --- 3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a