Albert ARIBAUD 96764df1b4 Merge samsung, imx, tegra into u-boot-arm/master ...

This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manual merge fixes.

2012-12-22 11:59:14 +01:00

..

bios_emulator

Add abs() macro to return absolute value

2012-05-15 08:31:37 +02:00

block

drivers/block/: sparse fixes

2012-11-04 11:00:37 -07:00

bootcount

Consolidate bootcount code into drivers/bootcount

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

dfu

dfu:usb:fix: Read the "filesize" environment variable only when file read

2012-09-21 00:05:00 +02:00

dma

MX28: DMA: Prolong the DMA timeout

2012-09-01 14:58:29 +02:00

fpga

FPGA: Cyclon II: Correctly reset the FPGA before configuration

2012-10-29 14:21:20 -07:00

gpio

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

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

hwmon

hwmon: do not init sensors on startup

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

i2c

designware_i2c.h: Define IC_CLK only if not already defined in config file

2012-12-11 13:17:32 -07:00

input

tegra: add CONSOLE_MUX support to tegra-kbc

2012-11-19 08:15:41 -07:00

misc

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

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

mmc

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

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

mtd

mtd: nand: mxs: reset BCH earlier, too, to avoid NAND startup problems

2012-12-11 17:19:51 -06:00

net

net: sh_eth: add support for SH7752

2012-12-15 12:28:24 -06: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

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

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

qe

mpc83xx: add support for mpc8309

2012-10-23 15:23:26 -05:00

rtc

pmic: Extend PMIC framework to support multiple instances of PMIC devices

2012-11-14 11:21:09 +01:00

serial

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

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

sound

SOUND: Add WM8994 codec

2012-11-15 21:08:20 +09:00

spi

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

2012-11-25 13:01:58 +01: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 remote-tracking branch 'u-boot/master' into u-boot-arm-merged

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

video

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

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

watchdog

dm: wdt: Move s5p watchdog timer to drivers/watchdog/

2012-11-15 21:08:19 +09:00