Albert ARIBAUD a891601ce5 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' ...

Conflicts:
	include/micrel.h

The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.

2014-01-06 08:49:58 +01:00

..

ali512x.c

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

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

cbmem_console.c

x86: Add console command to display CBMEM console buffer

2012-11-30 13:44:03 -08:00

cros_ec_i2c.c

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

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

cros_ec_lpc.c

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

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

cros_ec_spi.c

spi_flash: Add spi_flash_probe_fdt() to locate SPI by FDT node

2013-12-09 12:22:12 -07:00

cros_ec.c

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

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

ds4510.c

cmd_usage(): simplify return code handling

2010-07-24 20:43:57 +02:00

fsl_ifc.c

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

2013-12-02 08:38:28 -05:00

fsl_iim.c

arm: mx5: Add fuse supply enable in fsl_iim

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

gpio_led.c

gpio_led: add support for inverted polarity

2013-11-25 10:41:52 -05:00

Makefile

Driver/IFC: Move Freescale IFC driver to a common driver

2013-11-25 11:43:47 -08:00

mc9sdz60.c

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

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

mxc_ocotp.c

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

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

ns87308.c

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

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

pdsp188x.c

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

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

status_led.c

Coding Style cleanup: remove trailing white space

2013-10-14 16:06:53 -04:00

twl4030_led.c

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

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