Andi Kleen bcad6dc363 sections: fix section conflicts in arch/arm/ ...

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2012-10-06 03:04:38 +09:00

..

boot

Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-10-02 19:13:12 -07:00

common

ARM: dma-mapping: add support for dma_get_sgtable()

2012-07-30 12:25:47 +02:00

configs

Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi

2012-10-02 20:49:15 -07:00

crypto

arm/crypto: Add optimized AES and SHA1 routines

2012-09-07 04:17:02 +08:00

include

Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers

2012-10-03 13:45:43 -07:00

kernel

Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-10-02 18:32:35 -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

sections: fix section conflicts in arch/arm/

2012-10-06 03:04:38 +09:00

mach-bcm2835

ARM: dtb: move all dtb targets to common Makefile

2012-09-20 22:58:17 -07:00

mach-clps711x

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -07:00

mach-cns3xxx

…

mach-davinci

sections: fix section conflicts in arch/arm/

2012-10-06 03:04:38 +09:00

mach-dove

Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:28:06 -07:00

mach-ebsa110

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -07:00

mach-ep93xx

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-exynos

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-footbridge

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -07:00

mach-gemini

ARM: gemini: fix the gemini build

2012-09-04 22:17:34 -07:00

mach-h720x

…

mach-highbank

Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-10-02 19:13:12 -07:00

mach-imx

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-integrator

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -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

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-kirkwood

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22 01:07:21 -07:00

mach-ks8695

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:48:30 -07:00

mach-l7200/include/mach

…

mach-lpc32xx

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-mmp

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-msm

sections: fix section conflicts in arch/arm/

2012-10-06 03:04:38 +09:00

mach-mv78xx0

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22 01:07:21 -07:00

mach-mvebu

ARM: initial multiplatform support

2012-09-14 09:22:06 -05:00

mach-mxs

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-netx

ARM: netx: move platform_data definitions

2012-09-14 11:17:36 +02:00

mach-nomadik

Merge tag 'pinctrl-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2012-10-02 16:20:20 -07:00

mach-omap1

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -07:00

mach-omap2

sections: fix section conflicts in arch/arm/

2012-10-06 03:04:38 +09:00

mach-orion5x

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-picoxcell

ARM: initial multiplatform support

2012-09-14 09:22:06 -05:00

mach-prima2

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-pxa

Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2012-10-02 09:54:49 -07:00

mach-realview

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-rpc

ARM: fiq: change FIQ_START to a variable

2012-07-01 21:59:19 +08:00

mach-s3c24xx

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-s3c64xx

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07: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 tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-shark

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -07:00

mach-shmobile

Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-10-02 18:32:35 -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 tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-tegra

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2012-10-02 17:16:10 -07:00

mach-u300

Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

2012-10-02 17:26:42 -07:00

mach-ux500

Merge tag 'pinctrl-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2012-10-02 16:20:20 -07:00

mach-versatile

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-vexpress

Merge branch 'multiplatform/smp_ops' into next/multiplatform

2012-09-22 00:16:04 -07:00

mach-vt8500

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

mach-w90x900

ARM: w90x900: move platform_data definitions

2012-09-14 11:18:59 +02:00

mach-zynq

…

mm

Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-10-02 19:13:12 -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

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 tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

plat-nomadik

ARM: nomadik: move platform_data definitions

2012-09-14 11:19:00 +02:00

plat-omap

Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2012-10-02 09:54:49 -07:00

plat-orion

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22 01:07:21 -07: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 tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

plat-spear

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22 01:07:21 -07:00

plat-versatile

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

tools

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:32:45 -07: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 tag 'pinctrl-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2012-10-02 16:20:20 -07:00

Kconfig-nommu

…

Kconfig.debug

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 19:11:38 -07:00

Makefile

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-10-04 09:06:34 -07:00