| commit | 74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Jan 05 10:06:55 2011 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Jan 05 10:06:55 2011 +0000 |
| tree | a824b7da2936b0a19514541804874ce2c4ffd2d7 | |
| parent | 8c1b5306f0da93f5f9bb9aa7024828cb2b7ab387 [diff] | |
| parent | 2742f2ada3578db2fb676c1f23ad6a38d002608e [diff] |
Merge branch 'for-2.6.37' into for-2.6.38 Conflicts: sound/soc/samsung/smartq_wm8987.c