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)
commit011d3090c8dce483c842a4cecf9ae5afe3e29670
tree4eaaa5b5a0b5e0cf17b0a1b1475f6e0211a97edf
parent79870b7bca5a23c4b263b9a3335c67f1a7829f3e
parent5e51651de30677f9d36805de9c261bf80f415790
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>