diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
| commit | b46b353b901a45ebe860f8bf874ca99f018cd410 (patch) | |
| tree | e2d42c0f36b9d7b67c1a17fe97f4734552370a6b /drivers/i2c | |
| parent | 3c950e2ebfde083084cc926b020e3a22a536bf85 (diff) | |
| parent | daa989b47297c9f73426783599c286ef3a1f3f49 (diff) | |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'drivers/i2c')
| -rw-r--r--[-rwxr-xr-x] | drivers/i2c/Makefile | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/i2c/spr_i2c.c | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 29bda85dbd..29bda85dbd 100755..100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile diff --git a/drivers/i2c/spr_i2c.c b/drivers/i2c/spr_i2c.c index eabfe843f7..eabfe843f7 100755..100644 --- a/drivers/i2c/spr_i2c.c +++ b/drivers/i2c/spr_i2c.c |