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>
This commit is contained in:
Olof Johansson 2012-11-30 09:57:00 -08:00
commit 011d3090c8