projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
70caee0
3eb4351
)
Merge branch 'for-4.3/upstream' into for-4.3/wacom
author
Jiri Kosina
<
[email protected]
>
Fri, 17 Jul 2015 09:19:37 +0000
(11:19 +0200)
committer
Jiri Kosina
<
[email protected]
>
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 <
[email protected]
>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff