Merge branch 'sunxi/soc2' into next/soc
authorOlof Johansson <olof@lixom.net>
Fri, 30 Nov 2012 17:57:00 +0000 (09:57 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 30 Nov 2012 17:57:17 +0000 (09:57 -0800)
Adding one patch to fix build error.

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

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

Trivial merge