projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70caee0 3eb4351)
Merge branch 'for-4.3/upstream' into for-4.3/wacom
authorJiri Kosina <jkosina@suse.com>
Fri, 17 Jul 2015 09:19:37 +0000 (11:19 +0200)
committerJiri Kosina <jkosina@suse.com>
Fri, 17 Jul 2015 09:19:37 +0000 (11:19 +0200)
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>

Trivial merge