diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-13 07:35:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-13 07:35:26 -0700 |
| commit | fc8e38f142dd59f81306ff6a81c1351e9eb0e014 (patch) | |
| tree | 5f2fc612bdde9cbe264b544af2e3e0a429345ef6 /fs/ocfs2/slot_map.h | |
| parent | aa86f26bd81a46985f1b32e513638d1c36cf3104 (diff) | |
| parent | 105ce39ca4fabf20e3211cae1abc8f037e6a1f7f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ice1724 - Fix ESI Maya44 capture source control
ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs
ALSA: virtuoso: fix Xonar D1/DX front panel microphone
ALSA: hda - Add hp-dv4 model for IDT 92HD71bx
ALSA: hda - Fix mute-LED GPIO pin for HP dv series
ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice)
Diffstat (limited to 'fs/ocfs2/slot_map.h')
0 files changed, 0 insertions, 0 deletions