sugar/linux
1
0
Fork 0
Code Activity
Files
54d69df5849ec2e660aa12ac75562618c10fb499
linux/arch/arm
History
Olof Johansson 54d69df584 Merge branch 'late/kirkwood' into late/soc 
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-10-04 20:17:25 -07:00
..
boot
ARM: kirkwood: move new dtbs to common Makefile
2012-09-22 14:24:00 -07:00
common
…
configs
Merge branch 'kirkwood/drivers' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
2012-09-22 14:23:11 -07:00
include
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
kernel
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
lib
ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop
2012-09-09 17:28:48 +01:00
mach-at91
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
mach-bcm2835
ARM: dtb: move all dtb targets to common Makefile
2012-09-20 22:58:17 -07:00
mach-bcmring
Merge tag 'arm-perf-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/cleanup
2012-09-04 22:12:41 -07:00
mach-clps711x
…
mach-cns3xxx
…
mach-davinci
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mach-dove
ARM: kirkwood: move new dtbs to common Makefile
2012-09-22 14:24:00 -07:00
mach-ebsa110
ARM: ebsa110: use __iomem pointers for MMIO
2012-09-18 10:15:12 +02:00
mach-ep93xx
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-exynos
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-footbridge
…
mach-gemini
ARM: gemini: fix the gemini build
2012-09-04 22:17:34 -07:00
mach-h720x
…
mach-highbank
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-imx
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
mach-integrator
Merge branch 'cleanup/__iomem' into next/cleanup
2012-09-22 10:24:29 -07:00
mach-iop13xx
Merge branch 'cleanup/__iomem' into next/cleanup
2012-09-22 10:24:29 -07:00
mach-iop32x
Merge branch 'cleanup/__iomem' into next/cleanup
2012-09-22 10:24:29 -07:00
mach-iop33x
…
mach-ixp4xx
Merge branch 'next/cleanup' into late/kirkwood
2012-09-22 13:13:38 -07:00
mach-kirkwood
ARM: kirkwood: dockstar: fix header include
2012-09-22 14:24:04 -07:00
mach-ks8695
Merge branch 'cleanup/__iomem' into next/cleanup
2012-09-22 10:24:29 -07:00
mach-l7200/include/mach
…
mach-lpc32xx
Merge branch 'next/cleanup' into late/kirkwood
2012-09-22 13:13:38 -07:00
mach-mmp
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
mach-msm
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
mach-mv78xx0
Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
2012-09-22 14:22:47 -07:00
mach-mvebu
ARM: mvebu: fix build breaks from multi-platform conversion
2012-09-28 22:27:07 +02:00
mach-mxs
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-netx
ARM: netx: move platform_data definitions
2012-09-14 11:17:36 +02:00
mach-nomadik
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
mach-omap1
Merge branch 'late/kirkwood' into late/soc
2012-10-04 20:17:25 -07:00
mach-omap2
Merge branch 'late/kirkwood' into late/soc
2012-10-04 20:17:25 -07:00
mach-orion5x
Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
2012-09-22 14:22:47 -07:00
mach-picoxcell
ARM: initial multiplatform support
2012-09-14 09:22:06 -05:00
mach-prima2
Merge branch 'cleanup/__iomem' into next/cleanup
2012-09-22 10:24:29 -07:00
mach-pxa
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-realview
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-rpc
…
mach-s3c24xx
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-s3c64xx
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-s3c2410
…
mach-s3c2412
…
mach-s3c2440
…
mach-s5p64x0
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-s5pc100
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-s5pv210
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-sa1100
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
mach-shark
…
mach-shmobile
Merge branch 'next/cleanup' into late/kirkwood
2012-09-22 13:13:38 -07:00
mach-socfpga
ARM: initial multiplatform support
2012-09-14 09:22:06 -05:00
mach-spear3xx
ARM: move all dtb targets out of Makefile.boot
2012-09-14 09:22:04 -05:00
mach-spear6xx
ARM: move all dtb targets out of Makefile.boot
2012-09-14 09:22:04 -05:00
mach-spear13xx
Merge branch 'next/cleanup' into late/kirkwood
2012-09-22 13:13:38 -07:00
mach-tegra
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-u300
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-ux500
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-versatile
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-vexpress
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-vt8500
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-w90x900
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
mach-zynq
…
mm
Merge branch 'next/dt' into next/multiplatform
2012-09-20 21:16:43 -07:00
net
…
nwfpe
…
oprofile
…
plat-iop
Merge tag 'arm-perf-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/cleanup
2012-09-04 22:12:41 -07:00
plat-mxc
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
plat-nomadik
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
plat-omap
Merge branch 'late/kirkwood' into late/soc
2012-10-04 20:17:25 -07:00
plat-orion
ARM: mvebu: fix build breaks from multi-platform conversion
2012-09-28 22:27:07 +02:00
plat-pxa
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
plat-s3c24xx
ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
2012-08-08 09:04:51 +09:00
plat-samsung
Merge branch 'next/multiplatform' into late/kirkwood
2012-09-22 13:13:45 -07:00
plat-spear
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
plat-versatile
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
tools
ARM: mach-pnx4008: Remove architecture
2012-08-26 16:30:37 +02:00
vfp
ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled
2012-08-11 09:15:57 +01:00
Kconfig
Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
2012-09-22 14:22:47 -07:00
Kconfig-nommu
…
Kconfig.debug
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
Makefile
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00