53d22d886a13b9f6309c3333be55bd71d621eb8d
parent e913b146493993c8ac33561655c590e58b500c6f
author Linus Torvalds <torvalds@linux-foundation.org> 1286216159 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1286216159 -0700

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

* 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: i2c/other/ak4xx-adda: Fix a compile warning with CONFIG_PROCFS=n
  ALSA: prevent heap corruption in snd_ctl_new()
��