diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 12:00:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 12:00:22 +0000 |
| commit | a08a499aa3d85b605b5669cfc82b8e14232f7e91 (patch) | |
| tree | fd82da95552c996e9522a068ec77eae3a5ac6eec /include/linux/errqueue.h | |
| parent | Merge branch 'topic/pcm-internal' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into for-3.4 (diff) | |
| parent | Linux 3.3-rc3 (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 'include/linux/errqueue.h')
0 files changed, 0 insertions, 0 deletions