summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-kernel
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-11-22 15:07:31 +1030
committerJoel Stanley <joel@jms.id.au>2016-11-28 20:01:23 +1030
commite743b5a68974aae00f7fc3c8ddd727dd5e97ecd2 (patch)
tree2068bf1c9f4319b034d41c2bbb4d7ecdd62325f3 /meta-phosphor/common/recipes-kernel
parent3e20a3d4bdf222f6163acbb34713d76d2b3ac402 (diff)
downloadtalos-openbmc-e743b5a68974aae00f7fc3c8ddd727dd5e97ecd2.tar.gz
talos-openbmc-e743b5a68974aae00f7fc3c8ddd727dd5e97ecd2.zip
kernel: MTD fixes and Zaius dts updates
MTD fixes: ARM: dts: aspeed: restore labels of the flash modules ARM: dts: aspeed: resurrect PNOR on ast2500 evb Resolves openbmc/openbmc#816 Zaius device tree additions. These two were supposed to be part of the previous kernel bump but didn't make it: ARM: dts: aspeed: zaius: Add I2C master selector and hotswap controller ARM: dts: aspeed: zaius: Add 1-wire buses Change-Id: I659a26a602f2bf419cb7d4d0fdff97e3f55d99c1 Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-phosphor/common/recipes-kernel')
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
index f05cceb1e..b9d26652a 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
@@ -1,6 +1,6 @@
KBRANCH ?= "dev-4.7"
LINUX_VERSION ?= "4.7"
-SRCREV="90f82cf8e49f31c2e38e7f1abf564a8f5d89f80d"
+SRCREV="6fcd70b7e3d37b9189c9cdbcb982cf0862f63dff"
require linux-obmc.inc
OpenPOWER on IntegriCloud