diff options
| author | Linus Torvalds | 2011-02-20 10:15:57 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2011-02-20 10:15:57 -0800 |
| commit | 6f576d57f1fa0d6026b495d8746d56d949989161 (patch) | |
| tree | f1869e45eb1eb7ceff54610d121dc5dd4a977561 /fs/xfs/xfs_sb.h | |
| parent | a0c85e96d3b5609c918edd5a534a7cde9845b3fa (diff) | |
| parent | 89724958e5d596bb91328644c97dd80399443e87 (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: Do not announce false surround in Conexant auto
ALSA: HDA: Conexant auto: Handle multiple connections to ADC node
ALSA: HDA: Add position_fix quirk for an Asus device
ALSA: caiaq - Fix possible string-buffer overflow
ALSA: au88x0 - Modify pointer callback to give accurate playback position
Diffstat (limited to 'fs/xfs/xfs_sb.h')
0 files changed, 0 insertions, 0 deletions