]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit - drivers/tpm/tpm_tis_i2c.c
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Thu, 13 Jun 2013 19:16:15 +0000 (15:16 -0400)
committerTom Rini <trini@ti.com>
Thu, 13 Jun 2013 19:16:15 +0000 (15:16 -0400)
commit41341221d12341a2ecfb280142d6478071738fc2
tree850a87b274b572b65a579474a0aad5e590ca6d61
parentb7ab8b8ff092ab8214eeb86e8a79573154f448b9
parent847e6693ccb529bf8346db62876f38f0c4e04ade
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>
arch/arm/include/asm/arch-omap4/omap.h
arch/arm/include/asm/arch-omap5/omap.h
arch/arm/include/asm/omap_common.h
board/ti/am335x/board.c