Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfpri...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Jun 2013 05:30:28 +0000 (22:30 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Jun 2013 05:30:47 +0000 (22:30 -0700)
commit4d8f509e7a5d2eb636d57ddb677e504a90a4f99d
tree2f359163b1e8a08bd0d3a478096d80623582bfbf
parentb9747b3aafa7687414491e789c1a1b05c8781018
parent3cc3b617dc39dad1e566ccfc4500154cb7c51aa3
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>