projects
/
petitboot
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
37b4861
)
Merge remote-tracking rbanch sammj/master
author
Jeremy Kerr
<jk@ozlabs.org>
Fri, 26 Jun 2015 03:36:19 +0000
(11:36 +0800)
committer
Jeremy Kerr
<jk@ozlabs.org>
Fri, 26 Jun 2015 03:39:39 +0000
(11:39 +0800)
Conflicts:
discover/platform-powerpc.c
discover/ipmi.h
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
No differences found