From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 10 Sep 2009 13:32:47 +0000 (+0200)
Subject: Merge branch 'topic/ctl-add-remove-fixes' into for-linus
X-Git-Tag: v2.6.32-rc1~732^2~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f604529d0c1c24be025f47b591366e257ee75f66;p=~emulex%2Finfiniband.git

Merge branch 'topic/ctl-add-remove-fixes' into for-linus

* topic/ctl-add-remove-fixes:
  sound: snd_ctl_remove_user_ctl: prevent removal of kernel controls
  sound: snd_ctl_remove_unlocked_id: simplify user control counting
  sound: snd_ctl_remove_unlocked_id: simplify error paths
  sound: snd_ctl_elem_add: fix value count check
---

f604529d0c1c24be025f47b591366e257ee75f66