From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Nov 2012 17:57:00 +0000 (-0800)
Subject: Merge branch 'sunxi/soc2' into next/soc
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=011d3090c8dce483c842a4cecf9ae5afe3e29670;p=linux-edison.git

Merge branch 'sunxi/soc2' into next/soc

Adding one patch to fix build error.

* sunxi/soc2:
  ARM: sunxi: add missing include for mdelay()

Signed-off-by: Olof Johansson <olof@lixom.net>
---

011d3090c8dce483c842a4cecf9ae5afe3e29670