diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 09:07:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 09:07:27 -0700 |
commit | c7bcecbe98fe29e87ac7d01c70c5998806e0989f (patch) | |
tree | fa3c2d92ed0303adfb7eb2a8b82f2d22fea3aaf0 /arch/arm/include/asm/unified.h | |
parent | 96f3ee280549ebf62818ef71603061a3b3230eb9 (diff) | |
parent | 24af2b1cc418d6791b1d9e56bf6070cccb752db3 (diff) | |
download | talos-obmc-linux-c7bcecbe98fe29e87ac7d01c70c5998806e0989f.tar.gz talos-obmc-linux-c7bcecbe98fe29e87ac7d01c70c5998806e0989f.zip |
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 - Fix Realtek's chained fixup checks
Revert "ALSA: hda - Fix pin-config of Gigabyte mobo"
ALSA: HDA: Fix automute for Gateway NV79
ALSA: hda: add beep quirk for Realtek 0x1043:831a
ALSA: usb-audio - Terratec Aureon 7.1 USB ID as C-Media cm6206 quirks
ALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.
ALSA - au88x0 - Add buffer bytes constraints
Diffstat (limited to 'arch/arm/include/asm/unified.h')
0 files changed, 0 insertions, 0 deletions