From: Tom Rini Date: Wed, 24 Jul 2013 13:22:28 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-i2c X-Git-Tag: v2013.10-rc1~67 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2120fbfbc4d1f6953228f86be8bdbf38bacfdab;p=oweals%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-i2c The sandburst-specific i2c drivers have been deleted, conflict was just over the SPDX conversion. Conflicts: board/sandburst/common/ppc440gx_i2c.c board/sandburst/common/ppc440gx_i2c.h Signed-off-by: Tom Rini --- c2120fbfbc4d1f6953228f86be8bdbf38bacfdab