]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d72bdf0 dadbd09)
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)
commit49aab90a3d1282944dd4683ed625612533f9c1e7
tree92993f2b4015a21bf645ba4d14e75dd73a624261tree | snapshot
parentd72bdf097268dc908f7d71162740bfa3aa9e0399commit | diff
parentdadbd09ee4569cd79fe284f680d48d47fec73675commit | diff
Merge branch 'for-4.3/upstream' into for-4.3/wacom

There is a conflict between 99eda9d ("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>
Linux Kernel Source Tree.