Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 30 Jan 2013 18:04:23 +0000 (10:04 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 30 Jan 2013 18:04:56 +0000 (10:04 -0800)
commit3e93093ecd0c144e86a86cc1f165221b6cd3e7fb
tree0d6dffb90985bd90fd0ca43076a629f12e277096
parent43243322139194c2fea606095f82498e07536c27
parentda660b4a3b15caea9c198c4f26d1cf7023df92fc
Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux into next/drivers

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>
MAINTAINERS
arch/arm/mach-imx/common.h
arch/arm/mach-imx/platsmp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/timer.c