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

Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c

2013-05-30 14:45:06 +02:00

..

bios_emulator

biosemu: include <asm/io.h> header

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

block

part/dev_desc: Add log2 of blocksize to block_dev_desc data struct

2013-05-01 16:24:02 -04:00

bootcount

…

crypto

Exynos: Add hardware accelerated SHA256 and SHA1

2013-03-29 20:10:42 +09:00

dfu

dfu: NAND specific routines for DFU operation

2013-04-10 15:22:24 +02:00

dma

dma: Add i.MX6 support to drivers/dma/apbh_dma.c

2013-04-22 10:26:13 +02:00

fpga

fpga: Check device name against bitstream name

2013-05-06 10:41:25 +02:00

gpio

bfin: Move gpio support for bf54x and bf60x into the generic driver folder.

2013-05-13 16:30:27 +08:00

hwmon

…

i2c

i2c: zynq: Add support for Xilinx Zynq

2013-04-30 11:39:28 +02:00

input

…

misc

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

2013-05-11 22:24:28 +02:00

mmc

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

2013-05-30 14:45:06 +02:00

mtd

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

2013-05-30 14:45:06 +02:00

net

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

2013-05-30 14:45:06 +02:00

pci

…

pcmcia

…

power

palmas: use palmas_i2c_[read|write]_u8

2013-05-10 08:25:55 -04:00

qe

…

rtc

Consolidate bool type

2013-04-01 16:33:52 -04:00

serial

Power: remove support for Freescale MPC8220

2013-05-15 08:41:03 -04:00

sound

Sound: Support for MAX98095 codec in driver

2013-03-08 22:34:18 +09:00

spi

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

2013-05-30 14:45:06 +02:00

tpm

tpm: Add Infineon slb9635_i2c TPM driver

2013-04-12 14:13:00 -07:00

twserial

…

usb

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

2013-05-30 14:45:06 +02:00

video

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

2013-05-11 09:25:36 +02:00

watchdog

blackfin: Move blackfin watchdog driver out of the blackfin arch folder.

2013-05-13 16:30:26 +08:00