Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull namespace fixes from Eric Biederman:
 "This tree contains 4 fixes.

  The first is a fix for a race that can causes oopses under the right
  circumstances, and that someone just recently encountered.

  Past that are several small trivial correct fixes. A real issue that
  was blocking development of an out of tree driver, but does not appear
  to have caused any actual problems for in-tree code. A potential
  deadlock that was reported by lockdep. And a deadlock people have
  experienced and took the time to track down caused by a cleanup that
  removed the code to drop a reference count"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  sysctl: Drop reference added by grab_header in proc_sys_readdir
  pid: fix lockdep deadlock warning due to ucount_lock
  libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount
  mnt: Protect the mountpoint hashtable with mount_lock

path: root/sound/aoa/codecs/Kconfig

config SND_AOA_ONYX
	tristate "support Onyx chip"
	select I2C
	select I2C_POWERMAC
	---help---
	This option enables support for the Onyx (pcm3052)
	codec chip found in the latest Apple machines
	(most of those with digital audio output).

config SND_AOA_TAS
	tristate "support TAS chips"
	select I2C
	select I2C_POWERMAC
	---help---
	This option enables support for the tas chips
	found in a lot of Apple Machines, especially
	iBooks and PowerBooks without digital.

config SND_AOA_TOONIE
	tristate "support Toonie chip"
	---help---
	This option enables support for the toonie codec
	found in the Mac Mini. If you have a Mac Mini and
	want to hear sound, select this option.