tree 6192acd52c4bd0dcb0f502f35f94a8200ce6cf4c
parent 945754a1754f9d4c2974a8241ad4f92fad7f3a6a
parent 3e14b50dd4a3178f4f635267a2706b5d4f8c61ee
author Linus Torvalds <torvalds@linux-foundation.org> 1214248686 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1214248686 -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: sb - Fix wrong assertions
  ALSA: aw2 - Fix Oops at initialization