diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 00:50:09 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 00:50:09 +0000 |
| commit | ce0fda16084905d035e8ceb51cf42740ad781b15 (patch) | |
| tree | dd94ce9468c16b72a9e6cf6e0ce8ac7b1d7530c9 /drivers/rapidio/rio-driver.c | |
| parent | c9c7ae40660f5983854f73b6ae65f208e9a15082 (diff) | |
| parent | dfcd04b19d16c0016c705ed96a8b3cfa5315a2e9 (diff) | |
| parent | 24597bf8012cf3fa5703c38e1bb13df3118d7588 (diff) | |
| parent | 52c2843322362bfd847bdda1d3cebc751de68e5b (diff) | |
| parent | 46f344e2a0844d9b068bffa38cb48b52f4bd2d4a (diff) | |
Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt', 'for-32/i2c/eg20t-v4', 'for-32/i2c/designware-v5' and 'for-32/i2c/au1550' into for-linus/i2c-3.2