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

Conflicts:
	drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.

2013-09-05 11:15:26 +02:00

..

bios_emulator

biosemu: include <asm/io.h> header

2013-04-02 16:23:35 -04:00

block

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

2013-07-25 08:51:51 -04:00

bootcount

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

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

crypto

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

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

dfu

dfu, nand, ubi: add partubi alt settings for updating ubi partition

2013-08-26 21:56:34 +02:00

dma

dma: apbh: Add special circular mode for LCD

2013-08-09 21:48:34 +02:00

fpga

fpga: zynqpl: Clear loopback mode during device init

2013-08-12 08:52:01 +02:00

gpio

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

2013-09-04 11:50:25 +02:00

hwmon

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

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

i2c

fsl_i2c: add workaround for the erratum I2C A004447

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

input

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

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

misc

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

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

mmc

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

2013-09-05 11:15:26 +02:00

mtd

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

2013-09-04 11:50:25 +02:00

net

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

2013-09-05 11:15:26 +02:00

pci

powerpc/pcie: add PCIe version 3.x support

2013-08-09 12:41:41 -07:00

pcmcia

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

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

power

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

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

qe

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

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

rtc

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

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

serial

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

2013-09-05 11:15:26 +02:00

sound

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

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

spi

powerpc: Fix CamelCase checkpatch warnings

2013-08-20 09:57:51 -07:00

tpm

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

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

twserial

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

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

usb

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

2013-09-04 11:50:25 +02:00

video

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

2013-09-04 14:06:56 +02:00

watchdog

arm, am335x: add watchdog support

2013-08-28 11:44:59 -04:00