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>

arch/arm/mach-sunxi/sunxi.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,7 @@
	* warranty of any kind, whether express or implied.		* warranty of any kind, whether express or implied.
	*/		*/

			#include <linux/delay.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/of_address.h>		#include <linux/of_address.h>