tree 8518f579c841abc05075285a1d4683caa6eec9c2
parent c53dbf54863e7f3b0b8810dda2bdd0290006bdac
parent 219b22b24546dbd512419766eb46f6b729a5453a
author Linus Torvalds <torvalds@linux-foundation.org> 1224261035 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224261035 -0700

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: Fix debugfs_create_dir's error checking method for sound/soc/
  ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
  ALSA: kernel docs: fix sound/core/ kernel-doc
  ALSA: Handle NULL jacks in snd_jack_report()
  ALSA: hda - Fix PCM type of Nvidia HDMI devices