commit 5eca5634dd12ef22b9c86d406db592aae0cd4785
author Stewart Smith <stewart@linux.vnet.ibm.com> Thu May 12 14:19:51 2016 +1000
committer Stewart Smith <stewart@linux.vnet.ibm.com> Thu May 12 14:19:51 2016 +1000
tree 446426c748286b6758e8551426a176d9d83eab85
parent 24eb48c0f07259fb360d2a2b22261272ab92cb2c
parent 66133f351d2f5ca2689814a67327b5f2c442a06c

Merge branch 'master' into master-next

openpower/package/garrison-xml/garrison.mk

diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index a3b019f..f0fb9e2 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GARRISON_XML_VERSION ?= 124e1216e3d19715baaf576d809209124c73313e
+GARRISON_XML_VERSION ?= e266f74a93233785280ec36ba035fc262f2b35d1
 GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
 
 GARRISON_XML_LICENSE = Apache-2.0

openpower/package/hostboot/hostboot.mk

diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index af6df35..838279c 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_VERSION ?= dcf07f54b2b8cdf15ee930cc027660d37637331e
+HOSTBOOT_VERSION ?= 15bb028afc9ba8d3ab12e2f41459229bec68d921
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0