Albert ARIBAUD 3e11350255 Merge branch 'u-boot/master' into 'u-boot-arm/master' ...

Conflicts:
	Makefile
	drivers/net/npe/Makefile

These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.

2014-02-20 13:16:05 +01:00

..

am33xx

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

at91

arm: atmel: sama5d3: correct the ID for DBGU and PIT

2013-12-01 22:38:39 +01:00

exynos

exynos: clock: use the clear and set bits macros.

2014-02-10 16:01:44 +09:00

highbank

ARM: highbank: convert to common timer code

2013-11-04 11:08:10 -05:00

mx5

arm: mx5: Add fuse supply enable in fsl_iim

2014-01-03 15:44:06 +01:00

mx6

ARM: imx6: fix wrong fec clk

2014-02-11 11:31:52 +01:00

omap3

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

omap4

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

omap5

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

omap-common

Move #ifdef(CONFIG_DISPLAY_CPUINFO) from caller to callee

2014-02-19 11:10:05 -05:00

rmobile

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2013-12-10 22:23:59 +01:00

s5p-common

armv7: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

s5pc1xx

armv7: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

socfpga

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

tegra20

armv7: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

tegra30

kbuild: add dummy obj-y to create built-in.o

2014-02-19 11:07:50 -05:00

tegra114

kbuild: add dummy obj-y to create built-in.o

2014-02-19 11:07:50 -05:00

tegra124

kbuild,tegra124: add dummy obj- for Kbuild

2014-02-19 15:43:46 -05:00

tegra-common

armv7: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

u8500

armv7: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

vf610

armv7: convert makefiles to Kbuild style

2013-10-31 12:53:39 -04:00

zynq

arm: zynq: correct the argument to lldiv

2014-02-19 09:41:22 +01:00

cache_v7.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

config.mk

kbuild: change out-of-tree build

2014-02-19 11:07:50 -05:00

cpu.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

lowlevel_init.S

arm: use canonical sub mnemonic

2014-01-14 12:38:47 +01:00

Makefile

arm: atmel: sama5d3: spl boot from fat fs SD card

2013-12-01 22:38:51 +01:00

nonsec_virt.S

ARM: align MVBAR on 32 byte boundary

2013-12-06 21:03:35 +01:00

start.S

ARM: armv7: Make indirect vector addresses globl

2014-01-26 12:41:20 +01:00

syslib.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

virt-v7.c

ARM: virtualization: replace verbose license with SPDX identifier

2013-10-07 08:21:13 -04:00