From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 1 Sep 2015 13:23:13 +0000 (+0200)
Subject: Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for... 
X-Git-Tag: firefly_0821_release~176^2~1174^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e097d1271ecdff2f251a54ddfc5eaa1f9821e96;p=firefly-linux-kernel-4.4.55.git

Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus
---

3e097d1271ecdff2f251a54ddfc5eaa1f9821e96