Albert ARIBAUD 85b8c5c4bf Merge branch 'iu-boot/master' into 'u-boot-arm/master' ... Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.h Makefile conflicts are due to additions/removals of object files on the ARM branch vs KBuild introduction on the main branch. Resolution consists in adjusting the list of object files in the main branch version. This also applies to two files which are not listed as conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefile include/configs/omap4_common.h conflicts are due to the OMAP4 conversion to ti_armv7_common.h on the ARM side, and CONFIG_SYS_HZ removal on the main side. Resolution is to convert as this icludes removal of CONFIG_SYS_HZ. include/configs/pdnb3.h is due to a removal on ARM side. Trivial resolution is to remove the file. Note: 'git show' will also list two files just because they are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h		2013-11-09 22:59:47 +01:00
..
Makefile	drivers: convert makefiles to Kbuild style	2013-10-31 13:26:01 -04:00
at91sam9_wdt.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
bfin_wdt.c	blackfin: Move blackfin watchdog driver out of the blackfin arch folder.	2013-05-13 16:30:26 +08:00
ftwdt010_wdt.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
imx_watchdog.c	imx_watchdog: do not soft-reset while watchdog init	2013-10-31 17:54:03 +01:00
omap_wdt.c	arm, am335x: add watchdog support	2013-08-28 11:44:59 -04:00
s5p_wdt.c	Coding Style cleanup: remove trailing white space	2013-10-14 16:06:53 -04:00
tnetv107x_wdt.c	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
xilinx_tb_wdt.c	microblaze: Fix watchdog initialization	2013-10-16 09:24:38 -04:00