iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Sascha Hauer a89cf59b5c arm/imx: merge i.MX3 and i.MX6 
The patch merges the build of imx3 and imx6.  The Kconfig symbol
ARCH_IMX_V6_V7 is introduced to replace ARCH_MX3 and ARCH_MX6.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-10-31 14:26:28 +01:00
..
boot
arm/imx6q: add device tree source
2011-10-31 14:26:20 +01:00
common
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
configs
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
2011-10-20 15:14:25 +02:00
include/asm
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
kernel
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
lib
arm: remove "optimized" SHA1 routines
2011-08-07 14:07:03 -07:00
mach-at91
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-bcmring
ARM: mach-bcmring: remove mach/memory.h
2011-10-13 12:49:48 -04:00
mach-clps711x
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-cns3xxx
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-davinci
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-dove
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-ebsa110
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-ep93xx
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-exynos4
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-footbridge
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-gemini
ARM: mach-gemini: remove mach/memory.h
2011-10-13 12:49:37 -04:00
mach-h720x
ARM: mach-h720x: remove mach/memory.h
2011-10-13 12:49:45 -04:00
mach-imx
arm/imx: merge i.MX3 and i.MX6
2011-10-31 14:26:28 +01:00
mach-integrator
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-iop13xx
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-iop32x
ARM: mach-iop32x: remove mach/memory.h
2011-10-13 12:49:32 -04:00
mach-iop33x
ARM: mach-iop33x: remove mach/memory.h
2011-09-26 10:12:04 -04:00
mach-ixp4xx
ARM: mach-ixp4xx: remove mach/memory.h
2011-10-13 12:49:46 -04:00
mach-ixp23xx
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-ixp2000
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-kirkwood
ARM: mach-kirkwood: remove mach/memory.h
2011-09-26 10:12:00 -04:00
mach-ks8695
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-l7200/include/mach
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-lpc32xx
ARM: mach-lpc32xx: remove mach/memory.h
2011-10-13 12:49:36 -04:00
mach-mmp
ARM: mach-mmp: remove mach/memory.h
2011-10-13 12:49:41 -04:00
mach-msm
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
2011-10-23 14:42:30 +01:00
mach-mv78xx0
ARM: mach-mv78xx0: remove mach/memory.h
2011-10-13 12:49:29 -04:00
mach-mx5
Merge branch 'imx/devel' into imx/imx6q
2011-10-31 14:24:28 +01:00
mach-mxs
Merge branch 'cross-platform/debug_ll' into imx/imx6q
2011-10-31 14:24:41 +01:00
mach-netx
ARM: mach-netx: remove mach/memory.h
2011-10-13 12:49:35 -04:00
mach-nomadik
ARM: mach-nomadik: remove mach/memory.h
2011-10-13 12:49:33 -04:00
mach-nuc93x
ARM: mach-nuc93x: remove mach/memory.h
2011-10-13 12:49:40 -04:00
mach-omap1
ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h
2011-09-26 10:12:02 -04:00
mach-omap2
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
2011-10-23 14:42:30 +01:00
mach-orion5x
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-pnx4008
ARM: mach-pnx4008: remove mach/memory.h
2011-10-13 12:49:31 -04:00
mach-prima2
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-pxa
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-realview
Merge branch 'cross-platform/debug_ll' into imx/imx6q
2011-10-31 14:24:41 +01:00
mach-rpc
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-s3c64xx
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-s3c2410
ARM: mach-s3c2410: remove memory.h
2011-10-13 12:49:27 -04:00
mach-s3c2412
ARM: mach-s3c24*: convert boot_params to atag_offset
2011-08-21 17:15:09 -04:00
mach-s3c2416
ARM: mach-s3c24*: convert boot_params to atag_offset
2011-08-21 17:15:09 -04:00
mach-s3c2440
ARM: mach-s3c24*: convert boot_params to atag_offset
2011-08-21 17:15:09 -04:00
mach-s3c2443
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-s5p64x0
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
mach-s5pc100
ARM: mach-s5pc100: remove mach/memory.h
2011-10-13 12:49:43 -04:00
mach-s5pv210
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
2011-10-31 14:23:28 +01:00
mach-sa1100
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-shark
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-shmobile
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
2011-10-23 14:42:30 +01:00
mach-spear3xx
ARM: spear: remove mach/memory.h and plat/memory.h
2011-10-13 12:49:38 -04:00
mach-spear6xx
ARM: spear: remove mach/memory.h and plat/memory.h
2011-10-13 12:49:38 -04:00
mach-tcc8k
ARM: mach-tcc8k: convert boot_params to atag_offset
2011-08-21 17:15:15 -04:00
mach-tegra
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
2011-10-23 14:42:30 +01:00
mach-u300
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-ux500
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
2011-10-23 14:42:30 +01:00
mach-versatile
ARM: mach-versatile: remove mach/memory.h
2011-10-13 12:49:34 -04:00
mach-vexpress
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
2011-10-23 14:42:30 +01:00
mach-vt8500
ARM: mach-vt8500: remove mach/memory.h
2011-10-13 12:49:44 -04:00
mach-w90x900
ARM: mach-w90x900: remove mach/memory.h
2011-10-13 12:49:30 -04:00
mach-zynq
ARM: mach-zynq: remove mach/memory.h
2011-10-13 12:49:49 -04:00
mm
arm/imx: merge i.MX3 and i.MX6
2011-10-31 14:26:28 +01:00
nwfpe
…
oprofile
…
plat-iop
ARM: convert PCI defines to variables
2011-07-12 11:19:29 -05:00
plat-mxc
arm/imx: merge i.MX3 and i.MX6
2011-10-31 14:26:28 +01:00
plat-nomadik
net: remove mm.h inclusion from netdevice.h
2011-06-21 19:17:20 -07:00
plat-omap
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
2011-10-18 13:40:54 +01:00
plat-orion
genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
2011-07-07 16:02:26 +00:00
plat-pxa
mmc: sdhci-pxa: move platform data to include/linux/platform_data
2011-07-20 17:20:52 -04:00
plat-s3c24xx
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
plat-s5p
ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
2011-09-26 13:17:41 +09:00
plat-samsung
Merge branch 'cross-platform/debug_ll' into imx/imx6q
2011-10-31 14:24:41 +01:00
plat-spear
ARM: spear: remove mach/memory.h and plat/memory.h
2011-10-13 12:49:38 -04:00
plat-tcc
ARM: plat-tcc: remove mach/memory.h
2011-10-13 12:49:42 -04:00
plat-versatile
ARM: consolidate SMP cross call implementation
2011-05-23 16:53:17 +01:00
tools
ARM: 7051/1: cpuimx* boards: fix mach-types errors
2011-08-22 15:57:22 +01:00
vfp
ARM: vfp: Fix the comment to make it consistent with the code.
2011-09-23 12:05:30 +05:30
Kconfig
arm/imx6q: add core definitions and low-level debug uart
2011-10-31 14:26:21 +01:00
Kconfig-nommu
Fix common misspellings
2011-03-31 11:26:23 -03:00
Kconfig.debug
arm/imx6q: add core definitions and low-level debug uart
2011-10-31 14:26:21 +01:00
Makefile
arm/imx: merge i.MX3 and i.MX6
2011-10-31 14:26:28 +01:00