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

Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
	board/samsung/common/board.c

2014-03-25 10:53:15 +01:00

..

bios_emulator

kbuild: use Linux Kernel build scripts

2014-02-19 11:07:50 -05:00

block

ahci: wait longer for link.

2014-03-10 13:50:31 -04:00

bootcount

i2c, bootcount: add support for bootcounter on i2c devices

2014-02-20 06:46:56 +01:00

core

dm: Add base driver model support

2014-03-04 12:15:29 -05:00

crypto

drivers: convert makefiles to Kbuild style

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

ddr/fsl

driver/ddr: Add 256 byte interleaving support

2014-02-21 11:06:13 -05:00

demo

dm: Add a demonstration/example driver

2014-03-04 12:15:29 -05:00

dfu

usb: dfu: add static alt num count in dfu_config_entities()

2014-03-13 10:30:56 +09:00

dma

drivers: convert makefiles to Kbuild style

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

fpga

sizes.h - consolidate for all architectures

2014-03-04 12:15:01 -05:00

gpio

sandbox: Convert GPIOs to use driver model

2014-03-04 12:15:30 -05:00

hwmon

kbuild: use Linux Kernel build scripts

2014-02-19 11:07:50 -05:00

i2c

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

2014-02-26 16:49:58 -05:00

input

cros_ec: Support systems with no EC interrupt

2014-03-17 20:05:46 -06:00

misc

cros_ec: Implement I2C pass-through

2014-03-17 20:05:48 -06:00

mmc

drivers:mmc:sdhci: enable support for DT

2014-03-12 19:54:59 +09:00

mtd

mtd: spi: Fix page size for S25FL032P,S25FL064P

2014-03-17 21:54:57 +05:30

net

drivers: net: cpsw: init phy with gigabit features

2014-03-12 16:22:12 -04:00

pci

sizes.h - consolidate for all architectures

2014-03-04 12:15:01 -05:00

pcmcia

drivers: convert makefiles to Kbuild style

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

power

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

2014-03-05 12:51:26 +01:00

qe

drivers/qe: move the entry to drivers/Makefile

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

rtc

kbuild: use Linux Kernel build scripts

2014-02-19 11:07:50 -05:00

serial

sandbox: Allow Ctrl-C to work in sandbox

2014-03-17 20:05:49 -06:00

sound

sound: Move Samsung-specific code into its own file

2014-03-17 20:05:49 -06:00

spi

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

2014-03-25 10:53:15 +01:00

tpm

sandbox: tpm: Fix nvwrite command

2014-01-08 17:26:17 -07:00

twserial

drivers: convert makefiles to Kbuild style

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

usb

usb: net: introduce support for Moschip USB ethernet

2014-03-12 17:04:31 -04:00

video

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

2014-03-25 10:53:15 +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