diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-03-21 22:57:25 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-21 22:57:25 +0000 |
| commit | a0774f4511371319418f959ce838f81d47a3fd56 (patch) | |
| tree | 1a23cbcb83b4a384ef6659d95f7e32400e4ae010 /drivers/ata/pata_opti.c | |
| parent | e4394d553cec3cbf4d0c602fe39bc88bac43bd27 (diff) | |
| parent | 23e74a86ab43e5cccbf90edb76fc396e36acc998 (diff) | |
| parent | 173442f2787c88e1ed1bb62aaeb6fd9127720559 (diff) | |
| parent | 6b7d815c3f37f22c355b00362bc7c7d0bac9baea (diff) | |
Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-2