diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 07:00:22 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 07:00:22 -0500 |
| commit | a08a499aa3d85b605b5669cfc82b8e14232f7e91 (patch) | |
| tree | fd82da95552c996e9522a068ec77eae3a5ac6eec /Documentation/zorro.txt | |
| parent | 6d70934a0248d0d92e01116807c02c00ae172299 (diff) | |
| parent | d65b4e98d7ea3038b767b70fe8be959b2913f16d (diff) | |
Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.
Linux 3.3-rc3
.. the number of the half-beast?
Conflicts:
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm8994.c
Diffstat (limited to 'Documentation/zorro.txt')
0 files changed, 0 insertions, 0 deletions