diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-06-28 02:07:24 +0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-06-28 02:07:24 +0400 |
| commit | 69f81e86540716e68e98e401bb91f339d6a0d31f (patch) | |
| tree | 553d543a7ca6705b6a619bbaa9673dba3ea6fa4c /arch/arm/mach-prima2/Makefile.boot | |
| parent | 4a65163e3b2190445c1d94daa21d09c5af604d97 (diff) | |
| parent | b90ea76542c53300d39e76f72cf583cd0e0b1f68 (diff) | |
| parent | 5afa9d35782890e8fbd972f12ee5183ba5feb81d (diff) | |
| download | linux-69f81e86540716e68e98e401bb91f339d6a0d31f.tar.xz | |
Merge branches 'for-30-rc4/i2c-bfin', 'for-30-rc4/i2c-omap', 'for-30-rc4/i2c-s3c' and 'for-30-rc4/i2c-tegra' into for-30-rc5/all-i2c