Merge branch 'orion/cleanup' into orion/dt
authorOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 09:26:14 +0000 (01:26 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 09:26:49 +0000 (01:26 -0800)
commit52cfa7e54b480661e20dfd8788a24cfcba8a0ca5
tree1624420fb5814cb659f710967d6fb980110d40bf
parent2a18588c0ce336933be3c99c91e74e21db56a0fe
parent4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b
Merge branch 'orion/cleanup' into orion/dt

Merge in the cleanups that should have been used as the base of the DT
branch instead of letting the conflicts be exposed all the way up to
the toplevel merges.

All of these are caused by cleanups being done both in the cleanup branch
and the dt branch, resulting in remove/remove conflicts of header files.

By Andrew Lunn (3) and others
via Jason Cooper
* orion/cleanup:
  ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
  ARM: Kirkwood: checkpatch cleanups
  ARM: Kirkwood: Fix sparse warnings.
  ARM: Kirkwood: Remove unused includes
  ARM: kirkwood: cleanup lsxl board includes

Remove/remove conflicts in:
arch/arm/mach-kirkwood/board-dockstar.c
arch/arm/mach-kirkwood/board-goflexnet.c
arch/arm/mach-kirkwood/board-lsxl.c

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-kirkwood/board-dockstar.c
arch/arm/mach-kirkwood/board-dreamplug.c
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/board-goflexnet.c
arch/arm/mach-kirkwood/board-ib62x0.c
arch/arm/mach-kirkwood/board-iconnect.c
arch/arm/mach-kirkwood/board-iomega_ix2_200.c
arch/arm/mach-kirkwood/board-lsxl.c
arch/arm/mach-kirkwood/board-ts219.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/common.h