tree 14cd8ec9a0a61f7113149be38d79808cd5e955f8
parent e85427fd66a21b39145a47e67871a8863c0e5591
parent ecbd7e1ec7280d90d151a99691f74b892588cadd
author Tom Rini <trini@ti.com> 1374672148 -0400
committer Tom Rini <trini@ti.com> 1374673824 -0400

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 <trini@ti.com>