linux/arch/arm
Olof Johansson 6d55d5968a Merge branch 'next/soc' into HEAD
Conflicts:
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	drivers/clocksource/Makefile
2012-10-01 14:19:17 -07:00
..
boot Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
common ARM: dma-mapping: add support for dma_get_sgtable() 2012-07-30 12:25:47 +02:00
configs Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
include/asm Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
kernel Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -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 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-bcm2835 ARM: bcm2835: add stub clock driver 2012-09-19 19:08:53 -06:00
mach-bcmring Bunch of perf updates for the ARM backend that pave the way for 2012-09-04 22:12:41 -07:00
mach-clps711x ARM: clps711x: Remove the setting of the time 2012-07-17 22:24:30 +02:00
mach-cns3xxx
mach-davinci ARM: davinci: remove broken ntosd2_init_i2c 2012-08-10 13:14:36 +02:00
mach-dove Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup 2012-09-12 22:34:11 -07:00
mach-ebsa110 ARM: ebsa110: use __iomem pointers for MMIO 2012-09-18 10:15:12 +02:00
mach-ep93xx ARM: ep93xx: Move ts72xx.h out of include/mach 2012-09-17 09:09:08 +10:00
mach-exynos Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-footbridge ARM: footbridge: use fixed PCI i/o mapping 2012-07-26 09:09:59 -05:00
mach-gemini ARM: gemini: fix the gemini build 2012-09-04 22:17:34 -07:00
mach-h720x
mach-highbank clk: add highbank clock support 2012-07-11 17:58:47 -07:00
mach-imx Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -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 ARM: iop3xx: use fixed PCI i/o mapping 2012-07-26 09:10:04 -05:00
mach-ixp4xx ARM: ixp4xx: use __iomem pointers for MMIO 2012-09-19 15:19:13 +02:00
mach-kirkwood Remove the ancient omap specific atags that are no longer needed. 2012-09-16 19:28:42 -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/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-mmp Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-msm Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-mv78xx0 Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup 2012-09-12 22:34:11 -07:00
mach-mvebu arm: mvebu: generate DTBs for supported SoCs 2012-07-17 22:38:06 +02:00
mach-mxs phy/micrel: Rename KS80xx to KSZ80xx 2012-09-24 15:54:33 -04:00
mach-netx arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n 2012-07-30 17:25:13 -07:00
mach-nomadik Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-omap1 ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
mach-omap2 Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-orion5x Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-picoxcell clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer 2012-07-12 17:26:09 +02:00
mach-prima2 Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-pxa ARM: pmu: remove arm_pmu_type enumeration 2012-08-23 11:35:51 +01:00
mach-realview Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-rpc ARM: fiq: change FIQ_START to a variable 2012-07-01 21:59:19 +08:00
mach-s3c24xx Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-s3c64xx ARM: arm-soc soc updates, take 2 2012-07-30 09:45:53 -07:00
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0 arm-soc: device tree description updates 2012-07-23 16:17:43 -07:00
mach-s5pc100 arm-soc: device tree description updates 2012-07-23 16:17:43 -07:00
mach-s5pv210 arm-soc: board specific updates 2012-07-23 17:34:48 -07:00
mach-sa1100 ARM: sa1100: use __iomem pointers for MMIO 2012-09-19 15:19:16 +02:00
mach-shark ARM: shark: use fixed PCI i/o mapping 2012-07-26 09:09:58 -05:00
mach-shmobile Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-socfpga ARM: socfpga: initial support for Altera's SOCFPGA platform 2012-07-19 10:39:00 +02:00
mach-spear3xx Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
mach-spear6xx Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
mach-spear13xx ARM: spear13xx: use __iomem pointers for MMIO 2012-09-19 15:19:17 +02:00
mach-tegra Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-u300 ARM: u300: convert to sparse IRQs 2012-08-13 13:53:07 +02:00
mach-ux500 Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-versatile ARM: versatile: use fixed PCI i/o mapping 2012-07-26 09:09:56 -05:00
mach-vexpress ARM: pmu: remove arm_pmu_type enumeration 2012-08-23 11:35:51 +01:00
mach-vt8500 ARM: vt8500: Add support for UHCI companion controller 2012-08-16 14:00:37 -07:00
mach-w90x900
mach-zynq
mm Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
net ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support 2012-06-14 15:12:13 +01:00
nwfpe
oprofile ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration 2012-07-09 17:41:10 +01:00
plat-iop Bunch of perf updates for the ARM backend that pave the way for 2012-09-04 22:12:41 -07:00
plat-mxc Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
plat-nomadik i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h> 2012-07-09 11:40:40 +02:00
plat-omap Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
plat-orion ARM: Orion: Set eth packet size csum offload limit 2012-08-15 13:58:09 +00:00
plat-pxa Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
plat-s3c24xx ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters 2012-08-08 09:04:51 +09:00
plat-samsung Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
plat-spear Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
plat-versatile Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-07-27 15:14:26 -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 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
Kconfig-nommu
Kconfig.debug ARM: 7521/1: Fix semihosting Kconfig text 2012-09-07 20:40:44 +01:00
Makefile Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00