From: Jiri Kosina Date: Sat, 8 Jan 2011 00:08:19 +0000 (+0100) Subject: Merge branches 'upstream' and 'upstream-fixes' into for-linus X-Git-Tag: firefly_0821_release~7613^2~3088^2~7 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a7153258b70ccbe3922fcee9ca4271d4f4c2bc55;p=firefly-linux-kernel-4.4.55.git Merge branches 'upstream' and 'upstream-fixes' into for-linus --- a7153258b70ccbe3922fcee9ca4271d4f4c2bc55