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

..

bios_emulator

bios_emulator: delete an unnecessary include path

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

block

ahci: Fix cache align error messages

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

bootcount

am33xx: Make SoC bootcount driver have its own symbol

2013-11-11 12:17:35 -05:00

crypto

drivers: convert makefiles to Kbuild style

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

ddr/fsl

Driver/DDR: Update DDR driver to allow non-zero base address

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

dfu

usb: dfu: make nand upload working

2013-11-08 20:46:20 +01:00

dma

drivers: convert makefiles to Kbuild style

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

fpga

drivers: descend into sub directories only when it is necessary

2013-11-17 14:11:30 -05:00

gpio

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

hwmon

cosmetic: remove empty lines at the top of file

2013-11-08 09:41:37 -05:00

i2c

i2c: tegra: Add the fifth bus on SoC with more than 4 buses

2013-12-18 10:19:49 -07:00

input

drivers: convert makefiles to Kbuild style

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

misc

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

mmc

mmc: add Faraday FTSDC021 SDHCI controller support

2013-12-08 14:23:05 +02:00

mtd

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

2013-12-10 17:15:18 -05:00

net

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

pci

malta: support for coreFPGA6 boards

2013-11-09 17:21:01 +01:00

pcmcia

drivers: convert makefiles to Kbuild style

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

power

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

qe

drivers/qe: move the entry to drivers/Makefile

2013-11-17 14:11:31 -05:00

rtc

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

2013-11-11 09:40:34 -05:00

serial

serial: zynq: Remove unused #defines

2013-12-10 13:05:39 +01:00

sound

drivers: convert makefiles to Kbuild style

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

spi

Merge branch 'spi' of git://git.denx.de/u-boot-x86

2013-12-10 09:36:23 -05:00

tpm

drivers: tpm: clean up unused code

2013-11-17 14:11:30 -05:00

twserial

drivers: convert makefiles to Kbuild style

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

usb

Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

2013-12-06 16:54:42 +01:00

video

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2013-12-10 22:23:59 +01:00

watchdog

Merge branch 'iu-boot/master' into 'u-boot-arm/master'

2013-11-09 22:59:47 +01:00

Makefile

drivers/qe: move the entry to drivers/Makefile

2013-11-17 14:11:31 -05:00