diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-09 10:34:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-09 10:34:09 +1000 |
| commit | 2d1648caf46e8c23ff2be38472736183b3757adb (patch) | |
| tree | 21e2c33047b893a7a948b87909551fd85be73c1a | |
| parent | 1fccebd410ee7cb4774befbcfe6933c906e9de9b (diff) | |
| parent | bd588d8800abd6c6c92b85f07cc2c4a5780c7b8f (diff) | |
Merge remote branch 'bjdooks-i2c/next-i2c'
Conflicts:
arch/arm/plat-omap/i2c.c
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
0 files changed, 0 insertions, 0 deletions