From: Jiri Kosina <jkosina@suse.com>
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: omap-for-v4.3/fixes-rc1~125^2~1^12~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57f7e160a137f8ddae455f15abed9bdd1b90ab63;p=pandora-kernel.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 <jkosina@suse.com>
---

57f7e160a137f8ddae455f15abed9bdd1b90ab63