| commit | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb | |
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| Tue, 8 Nov 2011 01:17:30 +0000 (8 01:17 +0000) | ||
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| Tue, 8 Nov 2011 01:17:30 +0000 (8 01:17 +0000) | ||
| tree | 8dd15df476c14b4ab85d5beca775af561c2ea23d | treesnapshot (tar.gz zip) |
| parent | 03431972ac16bbfcbfb831bb37c419f8f71bf16d | commitdiff |
| parent | 19940b3d55c87d8089a8cb0fa8e5a9918a3846bd | commitdiff |
Merge branch 'for-3.2' into for-3.3
Conflicts:
sound/soc/codecs/wm8940.c
Conflicts:
sound/soc/codecs/wm8940.c