diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 12:05:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 12:05:59 -0400 |
| commit | 524196d2ad12cfe29e15d3db7b8d678dde35b5f7 (patch) | |
| tree | 7fb051f346c0b17e82aaef55f7e11ab1eb2f7675 /fs/timerfd.c | |
| parent | d36c30181c4cf6ead34ae30fa2c777b871225c87 (diff) | |
| parent | b793eb60a01d5b5e4aaeb2fbc2b036dec0d9f84d (diff) | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Correct WM8994 MICBIAS supply widget hookup
ASoC: Fix shift in WM8958 accessory detection default implementation
ASoC: sh: fsi-hdmi: fixup snd_soc_card name
ASoC: sh: fsi-da7210: fixup snd_soc_card name
ASoC: sh: fsi-ak4642: fixup snd_soc_card name
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions