| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun May 13 13:32:54 2012 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun May 13 13:32:54 2012 +0100 |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e [diff] | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 [diff] |
Merge tag 'v3.4-rc7' into for-3.5 Linux 3.4-rc7 Conflicts): drivers/base/regmap/regmap.c (overlap with bug fixes) sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)