tree 5cb8dbb71d691a760da61e319796800ee42cc1c5
parent a41eebab7537890409ea9dfe0fcda9b5fbdb090d
parent d71792ac3d48df6693f7b339e02494efc27036c3
author David Woodhouse <David.Woodhouse@intel.com> 1216075744 -0700
committer David Woodhouse <David.Woodhouse@intel.com> 1216075871 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

	sound/pci/Kconfig