Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux...

From Pawel Moll:
Versatile Express related driver updates for 3.9:
* Move sp810 header to a more generic location,
  mainly to share it with arm64

* tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux:
  arm: Move sp810.h to include/linux/amba/
  + Linux 3.8-rc5

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-imx/common.h
Simple merge

diff --cc arch/arm/mach-imx/platsmp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge