From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 26 Jun 2015 03:36:19 +0000 (+0800)
Subject: Merge remote-tracking rbanch sammj/master
X-Git-Tag: v1.0.0~74
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=37b4861cb01bf6bd9da41aa1b311a87b0d26fc25;hp=-c

Merge remote-tracking rbanch sammj/master

Conflicts:
	discover/platform-powerpc.c
	discover/ipmi.h

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

37b4861cb01bf6bd9da41aa1b311a87b0d26fc25