Merge branch 'next/fixes-non-critical' into for-next

author Arnd Bergmann <arnd@arndb.de>

Thu, 20 Jun 2013 15:34:04 +0000 (17:34 +0200)

committer Arnd Bergmann <arnd@arndb.de>

Thu, 20 Jun 2013 15:34:04 +0000 (17:34 +0200)
author Arnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 15:34:04 +0000 (17:34 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 15:34:04 +0000 (17:34 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/mach-prima2/pm.c
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Thu, 20 Jun 2013 15:34:04 +0000 (17:34 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Thu, 20 Jun 2013 15:34:04 +0000 (17:34 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-prima2/pm.c	patch \|	diff1 \|	diff2 \|	blob \| history