]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit57f7e160a137f8ddae455f15abed9bdd1b90ab63
tree92993f2b4015a21bf645ba4d14e75dd73a624261tree
parent70caee0a3721956a98cb4bfbfa0eaa38c9182e44commit | diff
parent3eb4351af42bd8b6de20daab07b204a85c35248fcommit | diff
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>
Ubuntu Artful kernel mirror