Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
52cfa7e54b
linux/arch/arm/mach-kirkwood
History
Olof Johansson 52cfa7e54b 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>
2012-11-26 01:26:49 -08:00
..
include/mach Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
addr-map.c arm: plat-orion: use void __iomem pointers for addr-map functions 2012-09-21 18:04:47 +00:00
board-dnskw.c ARM: Kirkwood: Convert dnskw to pinctrl 2012-11-24 02:57:56 +00:00
board-dockstar.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dreamplug.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dt.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-goflexnet.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-ib62x0.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-iconnect.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-iomega_ix2_200.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-km_kirkwood.c ARM: Kirkwood: Convert km_kirkwood to pinctrl 2012-11-24 02:58:48 +00:00
board-lsxl.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-mplcec4.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-ns2.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-nsa310.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-openblocks_a6.c ARM: Kirkwood: Add support LED of OpenBlocks A6 2012-11-24 02:59:12 +00:00
board-ts219.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-usi_topkick.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
common.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
common.h Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
cpuidle.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
d2net_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
db88f6281-bp-setup.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
dockstar-setup.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
guruplug-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
irq.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
Kconfig ARM: Kirkwood: Enable regulator and fixed regulators. 2012-11-24 02:56:54 +00:00
lacie_v2-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile ARM: kirkwood: Add Plat'Home OpenBlocks A6 support 2012-11-22 07:01:51 +00:00
Makefile.boot ARM: kirkwood: move new dtbs to common Makefile 2012-09-22 14:24:00 -07:00
mpp.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
mpp.h ARM: orion: Fix Orion5x GPIO regression from MPP cleanup 2012-02-09 16:16:31 -08:00
mv88f6281gtw_ge-setup.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
netspace_v2-setup.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
netxbig_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
openrd-setup.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
pcie.c ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan 2012-11-21 20:09:11 +00:00
rd88f6192-nas-setup.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
rd88f6281-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
sheevaplug-setup.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
t5325-setup.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
ts41x-setup.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
ts219-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
tsx1x-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00