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

Conflicts:
	drivers/video/exynos_fb.c

2013-04-12 22:07:57 +02:00

..

bios_emulator

biosemu: include <asm/io.h> header

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

block

Consolidate bool type

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

bootcount

Consolidate bootcount code into drivers/bootcount

2012-09-01 14:26:02 +02:00

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

mxs: dma: Fix APBH DMA driver for MX23

2013-01-28 11:43:00 +01:00

fpga

Consolidate bool type

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

gpio

Merge u-boot/master into u-boot-ti/master

2013-03-11 12:16:13 -04:00

hwmon

hwmon: do not init sensors on startup

2011-08-04 23:30:38 +02:00

i2c

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

2013-03-18 14:37:18 -04:00

input

ppc: Move mpc5xxx clocks to arch_global_data

2013-02-04 09:05:43 -05:00

misc

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

2012-12-19 13:02:36 -08:00

mmc

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

2013-04-04 11:49:32 +02:00

mtd

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

2013-04-12 22:07:57 +02:00

net

Consolidate bool type

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

pci

powerpc/p4080ds: fix PCI-e x8 link training down failure

2012-11-27 18:28:07 -06:00

pcmcia

PXA: Remove PXA PCMCIA support

2012-03-26 23:09:23 +02:00

power

Exynos5: TMU: Add hardware tripping

2013-03-12 17:07:31 +09:00

qe

ppc: Move CONFIG_QE to arch_global_data

2013-02-04 09:05:42 -05:00

rtc

Consolidate bool type

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

serial

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

2013-04-12 22:07:57 +02: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-04-12 22:07:57 +02:00

tpm

Introduce generic TPM support in u-boot

2011-12-07 08:45:51 +01:00

twserial

Switch from archive libraries to partial linking

2010-11-17 21:02:18 +01:00

usb

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

2013-04-12 22:07:57 +02:00

video

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

2013-04-12 22:07:57 +02:00

watchdog

mx31/mx35/mx51/mx53/mx6: add watchdog

2013-01-13 11:39:57 +01:00