From: Jiri Kosina Date: Fri, 17 Jul 2015 09:19:37 +0000 (+0200) Subject: Merge branch 'for-4.3/upstream' into for-4.3/wacom X-Git-Tag: firefly_0821_release~176^2~1174^2~1^12~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=57f7e160a137f8ddae455f15abed9bdd1b90ab63;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-4.3/upstream' into for-4.3/wacom There is a conflict between 67e123f ("Delete unnecessary checks") sitting in for-4.3/upstream and memory allocation failure handling from Jason Gerecke. Pull this so that conflict could be resolved. Signed-off-by: Jiri Kosina --- 57f7e160a137f8ddae455f15abed9bdd1b90ab63