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

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>

2013-07-12 10:36:48 -04:00

..

bios_emulator

biosemu: include <asm/io.h> header

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

block

dwc_ahsata: Allow use with dcache enabled

2013-06-26 16:26:45 +02: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:ext4:fix Fix DFU upload functionality

2013-07-03 08:41:23 -04: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

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

2013-07-10 20:40:47 +02:00

hwmon

hwmon: lm63: Use ARRAY_SIZE at appropriate place

2013-06-26 10:26:06 -04:00

i2c

EXYNOS: Resolve the i2c compilation error

2013-07-10 14:20:26 +09:00

input

cros: adds cros_ec keyboard driver

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

misc

cros: add LPC support for cros_ec

2013-06-26 10:13:28 -04:00

mmc

Fix block device accesses beyond 2TiB

2013-06-26 10:26:06 -04:00

mtd

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

2013-07-01 10:11:56 -04:00

net

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

2013-07-12 10:36:48 -04:00

pci

powerpc/boot: Change the macro of Boot from SRIO and PCIE master module

2013-06-20 17:08:48 -05:00

pcmcia

PXA: Remove PXA PCMCIA support

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

power

power:bat:trats: Break battery charging with ctrl+C

2013-07-05 18:46:14 +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 'master' of git://git.denx.de/u-boot-arm

2013-07-12 10:36:48 -04:00

sound

Sound: Support for MAX98095 codec in driver

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

spi

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

2013-07-12 10:36:48 -04:00

tpm

tpm: Reorganize the I2C TPM driver

2013-06-03 01:31:23 -07:00

twserial

Switch from archive libraries to partial linking

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

usb

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

2013-07-12 10:36:48 -04:00

video

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

2013-07-12 10:36:48 -04:00

watchdog

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

2013-06-08 14:35:10 +02:00