diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-23 13:40:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-23 13:40:36 -0400 |
| commit | 33eaf788345c0311ab48ae62673c05f59fb09bb3 (patch) | |
| tree | 6488b6839bed9580a7e0a8973f29b26c0d44d77e /fs/reiserfs/dir.c | |
| parent | 3a3076f4d6e2fa31338a0b007df42a3b32f079e0 (diff) | |
| parent | 227c4edb729790960f5f4991a703a398e925184c (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: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558
ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203
ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume
ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C
ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526
ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645
ALSA: hda - Fix resume from StR of HP 2510p with docking-station
Diffstat (limited to 'fs/reiserfs/dir.c')
0 files changed, 0 insertions, 0 deletions