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

Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR

Conflicts:
	arch/arm/include/asm/arch-omap5/omap.h

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

2013-06-13 15:16:15 -04: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

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

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

hwmon: do not init sensors on startup

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

i2c

ARM: OMAP: I2C: New read, write and probe functions

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

input

input: Finish simplifing key_matrix_decode_fdt()

2013-06-06 10:48:30 -04:00

misc

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

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

mmc

mmc: omap_hsmmc: Update pbias programming

2013-06-10 08:43:10 -04:00

mtd

bug, nand, am33xx: nand->ecc.strength not set in board_nand_init()

2013-06-04 11:50:04 -05:00

net

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

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

pci

pci: introduce CONFIG_PCI_INDIRECT_BRIDGE option

2013-06-07 14:17:01 -04:00

pcmcia

PXA: Remove PXA PCMCIA support

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

power

ARM: OMAP5: Power: Add more functionality to Palmas driver

2013-06-10 08:43:10 -04: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

arm: Remove OMAP2420H4 and all omap24xx support

2013-06-10 08:43:19 -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: 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-06-13 15:16:15 -04:00

video

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

2013-06-13 15:16:15 -04:00

watchdog

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

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