Linus Torvalds 2c757fd5d1 arm-soc: cleanups, part 2 ... More cleanups, continuing an earlier set with omap and samsung specific cleanups. These could not go into the first set because they have dependencies on various other series that in turn depend on the first cleanups. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPuewtAAoJEIwa5zzehBx3J+gQAJKLV8ga5P3adkPAWEceewhX pBjCgwgegs3V5GWhW3Svwhxpll5Djzzt891sAiZjh5eDZCfWy+CnxDJzyuh4mXok zRIfEVLZOopTVV3B31Uq7e7cYEy61Hm6QY4yLGknjxKrrc4CG3G1puvrbLvm1RiL tlFBdbCwwiLM6pnCyi6BTGKfvrbCgqpdaKSNmVjiwiKjAIvB8v++BsRxXXGWAbVR fq8uyiClIB+xhghhsUBLQ6V+pxF+XrjRnoNtl5tQE4VqUUl81UdbJVDfU3L67Q/V hFBNLf0uwO4ecu7Alyx+/c6Eax0N9tQ5VVtAkSRekKzID2/CoGp9w5JBwjctZNrm LuPvzaq11q/GzkmcVjrJ/U3FIxgFta+v6cY2CYtZAAfmxw4oAgr25eMRKTUHDGoy 1F7SD3KOEqT1OFgrHVM9XLYAHL+5i27dnGsk0Nk4qGYZLYVLJ1nxUUNvxV8jfXyJ AtqlYwm06vQxYLM86nV8g9xHssWBrOrCLEJ51rvjHfG+B5m5BifQlImGsHP1Xhut gnLvak3r4Xkc6ipeROikY0wH/Ss8aE/F0fP0TZMXH9e45eA0EVQEp+qnJOcld5o4 CR63OTD6u9j9TbIbJXmleItkADfcrk2dCHs1tF42+KA9VJJsWxRjj1+S+NfLVihU ScTFTiSPHPXAxWAwJIL1 =7UKB -----END PGP SIGNATURE----- Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc cleanups (part 2) from Olof Johansson: "More cleanups, continuing an earlier set with omap and samsung specific cleanups. These could not go into the first set because they have dependencies on various other series that in turn depend on the first cleanups." Fixed up conflicts in arch/arm/plat-omap/counter_32k.c due to commit bd0493eaaf: "move read_{boot,persistent}_clock to the architecture level" that changed how the persistent clocks were handled. And trivial conflicts in arch/arm/mach-omap1/common.h due to just independent changes close to each other. * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits) ARM: SAMSUNG: merge plat-s5p into plat-samsung ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung ARM: SAMSUNG: move platform device for s5p uart into plat-samsung ARM: SAMSUNG: move hr timer for common s5p into plat-samsung ARM: SAMSUNG: move pm part for common s5p into plat-samsung ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung ARM: SAMSUNG: move clock part for common s5p into plat-samsung ARM: S3C24XX: Use common macro to define resources on dev-uart.c ARM: S3C24XX: move common clock init into common.c ARM: S3C24XX: move common power-management code to mach-s3c24xx ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c ARM: S3C24XX: move plat-s3c24xx/cpu.c ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX GPMC: add ECC control definitions ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505 ARM: OMAP1: Pass dma request lines in platform data to MMC driver ...		2012-05-26 12:31:49 -07:00
..
am35xx.h	AM35xx EMAC: define submodule offsets	2010-05-20 10:53:55 -07:00
barriers.h	ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM)	2012-03-31 09:07:30 +01:00
board-rx51.h	OMAP2plus: Fix static function warnings	2010-10-08 10:02:49 -07:00
board-zoom.h	OMAP: DSS2: Move display.h to include/video/	2011-05-11 14:05:07 +03:00
ctrl_module_core_44xx.h	omap4: control: Add the register definition headers	2010-09-27 14:02:58 -06:00
ctrl_module_pad_core_44xx.h	ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields"	2012-05-04 12:45:21 -07:00
ctrl_module_pad_wkup_44xx.h	omap4: control: Add the register definition headers	2010-09-27 14:02:58 -06:00
ctrl_module_wkup_44xx.h	omap4: control: Add the register definition headers	2010-09-27 14:02:58 -06:00
debug-macro.S	ARM: OMAP: TI81XX: Prepare for addition of TI814X support	2011-12-13 10:46:44 -08:00
gpio.h	omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2	2009-10-19 17:32:58 -07:00
hardware.h	omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2	2009-10-19 17:32:58 -07:00
id.h	omap: Add new interface omap_get_die_id	2010-08-02 14:21:41 +03:00
irqs.h	omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2	2009-10-19 17:32:58 -07:00
omap-secure.h	ARM: OMAP4: PM: Add L2X0 cache lowpower support	2011-12-08 11:29:01 -08:00
omap-wakeupgen.h	ARM: OMAP4: Remove un-used WakeupGen register defines.	2012-05-08 11:54:24 +05:30
smp.h	omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2	2009-10-19 17:32:58 -07:00
timex.h	omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2	2009-10-19 17:32:58 -07:00
uncompress.h	omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2	2009-10-19 17:32:58 -07:00