iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Shawn Guo 3995eb8205 ARM: imx: merge plat-mxc into mach-imx 
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx.  It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.

To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
2012-10-15 10:02:19 +08:00
..
boot
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-10-12 12:32:43 +09:00
common
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
configs
UAPI Disintegration 2012-10-09
2012-10-09 15:04:25 +01:00
crypto
arm/crypto: Add optimized AES and SHA1 routines
2012-09-07 04:17:02 +08:00
include
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-14 13:39:34 -07:00
kernel
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-13 10:05:52 +09:00
lib
Merge branch 'arch-timers' into for-linus
2012-10-04 23:02:26 +01:00
mach-at91
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-bcm2835
ARM: dtb: move all dtb targets to common Makefile
2012-09-20 22:58:17 -07:00
mach-clps711x
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-cns3xxx
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-davinci
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-dove
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
mach-ebsa110
ARM: soc: driver specific changes
2012-10-01 18:46:13 -07:00
mach-ep93xx
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
mach-exynos
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-footbridge
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-gemini
ARM: gemini: fix the gemini build
2012-09-04 22:17:34 -07:00
mach-h720x
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
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
ARM: imx: merge plat-mxc into mach-imx
2012-10-15 10:02:19 +08:00
mach-integrator
ARM: integrator: use __iomem pointers for MMIO, part 2
2012-10-09 17:27:33 +02:00
mach-iop13xx
Merge branch 'late/fixes' into fixes
2012-10-07 07:22:32 -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: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-kirkwood
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
mach-ks8695
Merge branch 'late/fixes' into fixes
2012-10-07 07:22:32 -07:00
mach-l7200/include/mach
…
mach-lpc32xx
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
mach-mmp
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-msm
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-mv78xx0
Merge branch 'late/fixes' into fixes
2012-10-07 07:22:32 -07:00
mach-mvebu
ARM: mvebu: fix build breaks from multi-platform conversion
2012-09-28 22:27:07 +02:00
mach-mxs
ARM: soc: multiplatform enablement
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
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-omap1
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-omap2
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-orion5x
ARM: soc: late platform updates
2012-10-07 20:55:16 +09:00
mach-picoxcell
ARM: initial multiplatform support
2012-09-14 09:22:06 -05:00
mach-prima2
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-pxa
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-realview
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-rpc
ARM: rpc: check device_register return code in ecard_probe
2012-10-07 10:33:09 +02:00
mach-s3c24xx
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-s3c64xx
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-s3c2410
…
mach-s3c2412
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-s3c2440
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-s5p64x0
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-s5pc100
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-s5pv210
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-sa1100
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-shark
Merge branch 'late/fixes' into fixes
2012-10-07 07:22:32 -07:00
mach-shmobile
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01: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' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
mach-tegra
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-u300
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-ux500
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-versatile
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
mach-vexpress
Features:
2012-10-07 07:13:01 +09:00
mach-vt8500
arm: vt8500: Fix build warning in uncompress.h
2012-10-07 14:50:06 -07:00
mach-w90x900
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
mach-zynq
…
mm
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01: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-nomadik
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
plat-omap
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
plat-orion
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
plat-pxa
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
plat-s3c24xx
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
plat-samsung
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
plat-spear
ARM: config: sort select statements alphanumerically
2012-10-13 17:11:28 +01:00
plat-versatile
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-10-07 21:20:57 +09:00
tools
ARM: soc: cleanups, part 2
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
xen
xen/arm: receive Xen events on ARM
2012-09-14 13:37:32 +00:00
Kconfig
ARM: imx: merge plat-mxc into mach-imx
2012-10-15 10:02:19 +08:00
Kconfig-nommu
…
Kconfig.debug
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
Makefile
ARM: imx: merge plat-mxc into mach-imx
2012-10-15 10:02:19 +08:00