| commit | c2120fbfbc4d1f6953228f86be8bdbf38bacfdab | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Wed Jul 24 09:22:28 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Wed Jul 24 09:50:24 2013 -0400 |
| tree | 14cd8ec9a0a61f7113149be38d79808cd5e955f8 | |
| parent | e85427fd66a21b39145a47e67871a8863c0e5591 [diff] | |
| parent | ecbd7e1ec7280d90d151a99691f74b892588cadd [diff] |
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>