hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/arch/arm
History
Olof Johansson f4b96f5e4f Omap fixes and minor defconfig updates that would be good to 
get in before -rc1.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJR3RSDAAoJEBvUPslcq6Vz6rAQAK16H8VJB9l8pEzJGDS7/X0j
 8N+j1Zry0Ij0ZHQpzqR71h8Sh72PfdIVFnT6b04cJgBON92dmXqiBNv1pdIHRPlC
 DGyQ0W+vucF38iXRqSa7koxpEM8RRQcS4kJ3wUkvBwWA6s1x+MB/J5qtRkYg6iKI
 GPcBjIdh1pjBSLq37sCLQcSGxKHNH19i47KcN8C6piqiKNxnoDyVZKLAAt0jZNxe
 SrezGdz0keADDf/7/30TAjDBgY1LlWog6M9Ue6D6FO1YwFegWgM7XX3GsZfuhZ4s
 +zssE73UJETauOl7JJ+nsn8GDm2Q6U8zVm1pU9GEezm0pMCTJ2SDhtoxWY5zR/mH
 rYh8ia8IrMlX4mvQbKFhTZH3LWxLlGEJC21sCf5U3KuXv39SJlIjX9Qa/erWpMxd
 9McTyTWL7I6fXuMsuSUjdawvODem3kUXmwANNyMA1/NZ6uAMqK60l+/yLLjJRdFh
 jdFSeZ976ARp52TFqaf47KN3Jc5jJs5NVQ191JaoTxwWmgvaX0mcG8iKO7oaE+1y
 fR096Mt3jobMAbiQUdDnetkNBEiJ8uSJq4Y5IecvshAuPxu71eEB6OCdYQqmUfRo
 Nq8zPGmPKwT8rhCc2B3Paw++uI74f+S0WgsodGsDiBeFHzFztBY4PWKrXfxr9zzY
 01kscgUWM3MJ8xRWtVE+
 =kO4u
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Omap fixes and minor defconfig updates that would be good to
get in before -rc1.

* tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
  ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
  ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
  ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
  ARM: OMAP2+: devices: remove duplicated include from devices.c
  ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
  ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
  ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
  ARM: OMAP2+: Remove obsolete Makefile line
  ARM: OMAP5: Enable Cortex A15 errata 798181
  ARM: scu: provide inline dummy functions when SCU is not present
  ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
  ARM: OMAP2+: timer: initialize before using oh_name

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

Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
 		2013-07-12 10:59:39 -07:00
..
boot Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
common Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
configs Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
crypto ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling 2013-05-22 22:01:35 +01:00
include ARM: scu: provide inline dummy functions when SCU is not present 2013-07-04 05:10:51 -07:00
kernel Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
kvm KVM fixes for 3.11 2013-07-03 13:21:40 -07:00
lib
…
mach-at91 ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-bcm ARM: bcm281xx: Remove init_irq declaration in machine description 2013-05-14 09:48:40 -07:00
mach-bcm2835
…
mach-clps711x ARM: clps711x: Add support for SYSCON driver 2013-06-11 15:47:45 -07:00
mach-cns3xxx ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-davinci Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
mach-dove ARM: dove: move DT boards to SoC-centric clock init 2013-05-29 19:21:05 +00:00
mach-ebsa110 ARM: 7728/1: mm: Use phys_addr_t properly for ioremap functions 2013-05-23 00:09:44 +01:00
mach-ep93xx
…
mach-exynos Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
mach-footbridge
…
mach-gemini ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
mach-highbank ARM: highbank: remove the .map_io declaration 2013-05-24 10:23:05 +02:00
mach-imx Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds 2013-07-03 19:55:33 -07:00
mach-integrator ARM: integrator: let pciv3 use mem/premem from device tree 2013-06-27 14:19:54 +02:00
mach-iop13xx drivers/dma: remove unused support for MEMSET operations 2013-07-03 16:07:42 -07:00
mach-iop32x
…
mach-iop33x
…
mach-ixp4xx Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
mach-keystone ARM: keystone: Move CPU bringup code to dedicated asm file 2013-06-24 16:23:36 +02:00
mach-kirkwood ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
mach-ks8695
…
mach-lpc32xx
…
mach-mmp ARM: arm-soc board specific changes for 3.10, part 1 2013-05-04 12:34:30 -07:00
mach-msm Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
mach-mv78xx0 arm: mach-mv78xx0: convert to use the mvebu-mbus driver 2013-04-15 14:06:39 +00:00
mach-mvebu mvebu register map changes for v3.11 (round 2) 2013-06-21 20:00:08 +02:00
mach-mxs ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-netx
…
mach-nomadik ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-nspire arm: Add Initial TI-Nspire support 2013-06-21 20:06:30 +02:00
mach-omap1 ARM SoC driver specific changes 2013-07-02 14:33:21 -07:00
mach-omap2 Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
mach-orion5x ARM: Orion: Remove redundant init_dma_coherent_pool_size() 2013-05-13 19:35:39 +00:00
mach-picoxcell ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-prima2 ARM SoC cleanups 2013-07-02 13:25:35 -07:00
mach-pxa cpufreq: pxa: select CPU_FREQ_TABLE 2013-06-18 13:53:10 +05:30
mach-realview Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
mach-rockchip arm: add basic support for Rockchip RK3066a boards 2013-06-21 09:21:02 +02:00
mach-rpc
…
mach-s3c24xx Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
mach-s3c64xx ARM: SAMSUNG: Let platforms use the new watchdog reset driver 2013-06-19 03:13:16 +09:00
mach-s5p64x0 ARM: s5p64x0: avoid build warning for uncompress.h 2013-06-20 17:31:50 +02:00
mach-s5pc100 ARM: SAMSUNG: Let platforms use the new watchdog reset driver 2013-06-19 03:13:16 +09:00
mach-s5pv210 ARM: SAMSUNG: Consolidate uncompress subroutine 2013-06-19 02:22:18 +09:00
mach-sa1100
…
mach-shark
…
mach-shmobile Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
mach-socfpga Adds basic support for Rockchip Cortex-A9 SoCs. 2013-06-21 11:46:56 +02:00
mach-spear ARM: spear: Remove init_irq declaration in machine description 2013-05-24 10:12:51 +02:00
mach-sti ARM: sti: Add STiH416 SOC support 2013-06-25 13:26:58 -07:00
mach-sunxi ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-tegra Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
mach-u300 ARM: u300: only build for ARCH_MULTI_V5 2013-06-20 12:20:47 +02:00
mach-ux500 The common clock framework changes for 3.11 include new clock drivers 2013-07-03 11:54:50 -07:00
mach-versatile
…
mach-vexpress ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-virt Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
mach-vt8500 Cleanups in various machine definitions 2013-05-31 22:08:11 -07:00
mach-w90x900
…
mach-zynq ARM: zynq: use DT_MACHINE_START 2013-07-05 23:07:39 +02:00
mm mm/ARM: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:35 -07:00
net
…
nwfpe
…
oprofile
…
plat-iop drivers/dma: remove unused support for MEMSET operations 2013-07-03 16:07:42 -07:00
plat-omap ARM SoC driver specific changes 2013-07-02 14:33:21 -07:00
plat-orion drivers/dma: remove unused support for MEMSET operations 2013-07-03 16:07:42 -07:00
plat-pxa
…
plat-samsung Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
plat-versatile ARM: 7766/1: versatile: don't mark pen as __INIT 2013-06-24 15:23:56 +01:00
tools
…
vfp ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported 2013-05-22 22:01:37 +01:00
xen xen/arm: rename xen_secondary_init and run it on every online cpu 2013-05-13 16:14:25 +00:00
Kconfig Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
Kconfig-nommu ARM: mpu: Ensure that MPU depends on CPU_V7 2013-06-17 15:13:18 +01:00
Kconfig.debug Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
Makefile Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00