tree 9a1ee0292fce0243406f2e66c170d25e062730a2
parent c027a474a68065391c8773f6e83ed5412657e369
parent 9f3b24948f22e4e21e961bd514c2089d24f0938e
author Linus Torvalds <torvalds@linux-foundation.org> 1312354102 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312354102 -1000

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: asihpi - Clarify adapter index validity check
  ALSA: asihpi - Don't leak firmware if mem alloc fails
  ALSA: rtctimer.c needs module.h
  ASoC: Fix txx9aclc.c build
  ALSA: hdspm - Add firmware revision 0xcc for RME MADI
  ALSA: hdspm - Fix reported external sample rate on RME MADI and MADIface
  ALSA: hdspm - Provide MADI speed mode selector on RME MADI and MADIface
  ALSA: sound/core/pcm_compat.c: adjust array index