sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity
u-boot/arch/arm/imx-common
History
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
..
Makefile kbuild: use Linux Kernel build scripts 2014-02-19 11:07:50 -05:00
cmd_bmode.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
cmd_hdmidet.c Merge git://git.denx.de/u-boot-arm 2013-07-31 11:30:38 +02:00
cpu.c mx6: Distinguish mx6dual from mx6quad 2014-02-11 11:24:12 +01:00
i2c-mxv7.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
iomux-v3.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
misc.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
sata.c MX6: fix sata compilation for i.MX6 2013-12-19 11:04:33 +01:00
speed.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
timer.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00