diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-19 19:17:10 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-19 19:17:10 +0900 |
| commit | f6e46ae658e4443e765f87702603deca167f2b57 (patch) | |
| tree | 8b1a6e628defdcc10e788bd3d903e8c14e314aed /drivers/of/of_i2c.c | |
| parent | 7710601a8b24a3f77ebdfc7b213c21344c650987 (diff) | |
| parent | 82b67d73b121febe5ae76747680a2d979c21c5e6 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
Conflicts:
drivers/of/Makefile
Diffstat (limited to 'drivers/of/of_i2c.c')
0 files changed, 0 insertions, 0 deletions