diff options
author | Ben Dooks <ben-linux@fluff.org> | 2012-01-18 00:30:41 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2012-01-18 00:30:41 +0100 |
commit | 6f36a806e588f2ce62571a1859ea1d7f2c7dde83 (patch) | |
tree | 44485aee19bcaf05b0baaf83ea62d7e5ddd78b9c /drivers/dma/coh901318_lli.h | |
parent | i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor (diff) | |
parent | i2c: OMAP: Add DT support for i2c controller (diff) | |
download | linux-6f36a806e588f2ce62571a1859ea1d7f2c7dde83.tar.xz linux-6f36a806e588f2ce62571a1859ea1d7f2c7dde83.zip |
Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33
Diffstat (limited to 'drivers/dma/coh901318_lli.h')
0 files changed, 0 insertions, 0 deletions