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

..

battery

drivers: convert makefiles to Kbuild style

2013-10-31 13:26:01 -04:00

fuel_gauge

drivers: convert makefiles to Kbuild style

2013-10-31 13:26:01 -04:00

mfd

drivers: convert makefiles to Kbuild style

2013-10-31 13:26:01 -04:00

pmic

drivers: convert makefiles to Kbuild style

2013-10-31 13:26:01 -04:00

exynos-tmu.c

power: exynos-tmu: use the mux_addr bit fields in tmu_control register

2013-06-13 17:53:37 +09:00

ftpmu010.c

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

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

Makefile

drivers: convert makefiles to Kbuild style

2013-10-31 13:26:01 -04:00

palmas.c

ARM: OMAP5: Power: Add new function to turn on SMPS10

2013-10-20 23:42:39 +02:00

power_core.c

power:pmic: prevent data abort for pmic bat command

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

power_dialog.c

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

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

power_fsl.c

power: power_fsl: Pass p->bus in the same way for SPI and I2C cases

2013-11-27 09:39:22 +01:00

power_i2c.c

pmic:i2c: Replace legacy I2C_SET_BUS macro with i2c_set_bus_num()

2013-08-20 11:15:32 +02:00

power_spi.c

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

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

tps6586x.c

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

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

twl4030.c

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

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

twl6030.c

ARMV7: OMAP4: Add twl6032 support

2013-12-04 08:11:28 -05:00