linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00

History

Shawn Guo 1b929995eb arm/imx: fix AUTO_ZRELADDR selection

The AUTO_ZRELADDR selection for ARCH_IMX_V4_V5 and ARCH_MX5 should
really be mutually exclusive to ZBOOT_ROM just like what ARCH_IMX_V6_V7
does.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

2011-11-11 16:53:34 +01: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 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

configs

ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos

2011-11-06 13:54:56 +09:00

include/asm

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2011-11-04 18:02:25 -07:00

kernel

Merge branch 'highbank/soc' into next/soc

2011-11-02 02:46:10 +01:00

lib

Merge branch 'misc' into for-linus

2011-10-25 08:19:59 +01:00

mach-at91

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

mach-bcmring

arm: fix implicit use of sched.h in bcmring/dma.c

2011-10-31 19:30:47 -04:00

mach-clps711x

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-cns3xxx

Merge branch 'depends/rmk/memory_h' into next/cleanup2

2011-11-01 13:47:27 +01:00

mach-davinci

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

mach-dove

Merge branch 'depends/rmk/memory_h' into next/cleanup2

2011-11-01 13:47:27 +01:00

mach-ebsa110

Merge branch 'dt/gic' into highbank/soc

2011-10-31 14:11:34 +01:00

mach-ep93xx

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

mach-exynos

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08: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

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-highbank

ARM: highbank: add suspend support

2011-10-31 14:14:05 +01:00

mach-imx

arm/imx: fix the references to ARCH_MX3

2011-11-11 16:53:33 +01:00

mach-integrator

Merge branch 'depends/rmk/memory_h' into next/cleanup2

2011-11-01 13:47:27 +01:00

mach-iop13xx

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

mach-iop32x

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-iop33x

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-ixp4xx

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mach-ixp23xx

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-ixp2000

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

mach-kirkwood

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

mach-ks8695

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-11-01 00:25:01 +01: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

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-11-01 00:25:01 +01:00

mach-mmp

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

mach-msm

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mach-mv78xx0

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-11-01 00:25:01 +01:00

mach-mx5

ARM: mx51/53: set pwm clock parent to ipg_perclk

2011-11-11 16:53:33 +01: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

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

mach-nomadik

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-11-01 00:25:01 +01:00

mach-omap1

Merge branch 'fixes-modulesplit' into fixes

2011-11-07 12:27:23 -08:00

mach-omap2

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

2011-11-07 16:14:26 -08:00

mach-orion5x

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

mach-picoxcell

picoxcell: add a definition of VMALLOC_END

2011-10-04 21:25:10 +01:00

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 git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08: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

Merge branch 'dt/gic' into highbank/soc

2011-10-31 14:11:34 +01:00

mach-s3c64xx

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mach-s3c2410

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mach-s3c2412

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-s3c2416

Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:21:21 -07:00

mach-s3c2440

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-s3c2443

Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:21:21 -07:00

mach-s5p64x0

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-s5pc100

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-s5pv210

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-sa1100

arm: fix implicit use of page.h in several arch/arm files

2011-10-31 19:30:46 -04:00

mach-shark

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-shmobile

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mach-spear3xx

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-spear6xx

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-tcc8k

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-tegra

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mach-u300

Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

2011-11-03 09:40:51 -07:00

mach-ux500

Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

2011-11-03 09:40:51 -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

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

nwfpe

…

oprofile

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-02-15 10:18:48 -08:00

plat-iop

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

plat-mxc

arm/imx: fix AUTO_ZRELADDR selection

2011-11-11 16:53:34 +01: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 'fixes-modulesplit' into fixes

2011-11-07 12:27:23 -08:00

plat-orion

ARM: 7063/1: Orion: gpio: add missing include of linux/types.h

2011-08-24 08:29:20 +01:00

plat-pxa

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

plat-s3c24xx

Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:21:21 -07:00

plat-s5p

ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos

2011-11-06 13:54:56 +09:00

plat-samsung

arm: Add export.h to recently added files for EXPORT_SYMBOL

2011-11-07 10:28:58 -08:00

plat-spear

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-11-01 00:25:01 +01:00

plat-tcc

ARM: plat-tcc: remove mach/memory.h

2011-10-13 12:49:42 -04:00

plat-versatile

ARM: versatile: convert logical CPU numbers to physical numbers

2011-10-17 10:01:11 +01:00

tools

ARM: Add a few machine types to mach-types

2011-10-17 13:28:46 +01:00

vfp

arm: remove several unnecessary module.h include instances

2011-10-31 19:30:48 -04:00

Kconfig

ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos

2011-11-06 13:54:56 +09:00

Kconfig-nommu

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kconfig.debug

Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 21:08:03 -07:00

Makefile

ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos

2011-11-06 13:54:56 +09:00