tree 9f9cb4a2cd18e64a63535878d30253236ccca5e0
parent 9f71963702764243d0835b07660ae505b66ca09f
parent ac0547dc62e67a3e0b0c1628b6e49efba8f517db
author Linus Torvalds <torvalds@linux-foundation.org> 1278971083 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278971083 -0700

Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Restore cleared pin controls on resume