Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Oct 2010 18:15:59 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Oct 2010 18:15:59 +0000 (11:15 -0700)
commitd9f73afcd364eb02b355921f6101db9e7ee4001c
tree43870615470ed12414fa9b3fcc1f249fc1fd36c4
parent53d22d886a13b9f6309c3333be55bd71d621eb8d
parente913b146493993c8ac33561655c590e58b500c6f
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()