Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfpri...

Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/fixes-non-critical

From Barry Song, SiRF fixes for v3.10 (that we're punting to 3.11):

- Replace include linux/module.h with linux/export.h
- fix a checkpatch issue
- use of_platform_populate instead of of_platform_bus_probe

* tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  arm: prima2: use of_platform_populate instead of of_platform_bus_probe
  ARM: prima2: fix a checkpatch issue
  ARM: prima2: Replace include linux/module.h with linux/export.h
  + Linux 3.10-rc4

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