Linus Torvalds
994c0e9925
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
...
* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
MAINTAINERS: add ARM/FREESCALE IMX6 entry
arm/imx: merge i.MX3 and i.MX6
arm/imx6q: add suspend/resume support
arm/imx6q: add device tree machine support
arm/imx6q: add smp and cpu hotplug support
arm/imx6q: add core drivers clock, gpc, mmdc and src
arm/imx: add gic_handle_irq function
arm/imx6q: add core definitions and low-level debug uart
arm/imx6q: add device tree source
ARM: highbank: add suspend support
ARM: highbank: Add cpu hotplug support
ARM: highbank: add SMP support
MAINTAINERS: add Calxeda Highbank ARM platform
ARM: add Highbank core platform support
ARM: highbank: add devicetree source
ARM: l2x0: add empty l2x0_of_init
picoxcell: add a definition of VMALLOC_END
picoxcell: remove custom ioremap implementation
picoxcell: add the DTS for the PC7302 board
picoxcell: add the DTS for pc3x2 and pc3x3 devices
...
Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
by Arnd).
2011-11-01 21:08:03 -07:00
..
boot
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
common
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
configs
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:31:25 -07:00
include /asm
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
kernel
Merge branch 'highbank/soc' into next/soc
2011-11-02 02:46:10 +01:00
lib
mach-at91
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
mach-bcmring
mach-clps711x
mach-cns3xxx
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-davinci
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:31:25 -07:00
mach-dove
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-ebsa110
mach-ep93xx
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
mach-exynos4
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-footbridge
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-gemini
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-h720x
mach-highbank
mach-imx
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
mach-integrator
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
mach-ixp23xx
mach-ixp2000
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-kirkwood
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-ks8695
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-l7200/include /mach
mach-lpc32xx
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-mmp
Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 19:55:06 -07:00
mach-msm
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
mach-mv78xx0
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-mx5
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
mach-mxs
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-netx
mach-nomadik
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-omap1
Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:58:25 -07:00
mach-omap2
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
mach-orion5x
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-picoxcell
mach-pnx4008
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-prima2
Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:22:01 -07:00
mach-pxa
Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 19:55:06 -07:00
mach-realview
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-rpc
mach-s3c64xx
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
mach-s3c2410
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-s3c2412
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-s3c2416
mach-s3c2440
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-s3c2443
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-s5p64x0
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
mach-s5pc100
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-s5pv210
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-sa1100
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-shark
mach-shmobile
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-spear3xx
mach-spear6xx
mach-tcc8k
mach-tegra
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:31:25 -07:00
mach-u300
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-ux500
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-versatile
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-vexpress
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-vt8500
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-w90x900
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-zynq
mm
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
nwfpe
oprofile
plat-iop
plat-mxc
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
plat-nomadik
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:18:05 -07:00
plat-omap
Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:58:25 -07:00
plat-orion
plat-pxa
Merge branch 'depends/rmk/gpio' into next/fixes
2011-10-31 22:44:18 +01:00
plat-s3c24xx
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
plat-s5p
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
plat-samsung
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
plat-spear
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
plat-tcc
plat-versatile
tools
vfp
Kconfig
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
Kconfig-nommu
Kconfig.debug
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
Makefile
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00