Albert ARIBAUD 4b19b7448e Merge remote-tracking branch 'u-boot-imx/master' ... The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c		2014-10-08 21:20:49 +02:00
..
arc	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
arm	Merge remote-tracking branch 'u-boot-imx/master'	2014-10-08 21:20:49 +02:00
avr32	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
blackfin	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
m68k	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
microblaze	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
mips	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
nds32	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
nios2	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
openrisc	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
powerpc	Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq	2014-09-26 09:57:52 -04:00
sandbox	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
sh	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
sparc	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
x86	cosmetic: replace MIN, MAX with min, max	2014-09-24 18:30:29 -04:00
.gitignore	.gitignore: drop include/asm/proc from ignore pattern	2014-06-19 11:18:54 -04:00
Kconfig	kconfig: move CONFIG_OF_* to Kconfig	2014-09-25 09:27:50 -04:00