diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-07 08:43:30 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-07 08:43:30 +1100 |
| commit | 6bacaa9ddacb71c691d32c678d37bc59ffc71fac (patch) | |
| tree | 6429fa27227706f1cfe8fa462a141b0646f345ae /drivers/gpu/drm/ttm/ttm_bo_util.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge branch 'fix/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus-uncursed (diff) | |
| download | linux-dev-6bacaa9ddacb71c691d32c678d37bc59ffc71fac.tar.xz linux-dev-6bacaa9ddacb71c691d32c678d37bc59ffc71fac.zip | |
Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just a couple of build regression fixes for ASoC fsl stuff. It
doesn't look too trivial, but neither intrusive, so hopefully I can
avoid your curse..."
Hey, Takashi has a good track record, I think he gets a pass..
* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: fsl: fix snd-soc-imx-pcm module build
Revert "ASoC: fsl: fix multiple definition of init_module"
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions