Skip to content
Snippets Groups Projects
Commit c2120fbf authored by Tom Rini's avatar Tom Rini
Browse files

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: default avatarTom Rini <trini@ti.com>
parents e85427fd ecbd7e1e
No related branches found
No related tags found
No related merge requests found
Showing
with 155 additions and 83 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment