From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Oct 2010 18:15:59 +0000 (-0700)
Subject: Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v3.12-rc1~8551
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9f73afcd364eb02b355921f6101db9e7ee4001c;p=kernel%2Fkernel-generic.git

Merge branch 'fix/misc' of git://git./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()
---

d9f73afcd364eb02b355921f6101db9e7ee4001c