tree d500294174e67cbb208eaf5d7f9741be48eca8a6
parent 28d0325ce6e0a52f53d8af687e6427fee59004d3
parent dd5e8e6b1d4c218d2bafe002231ec460459ab5c4
author Takashi Iwai <tiwai@suse.de> 1245936494 +0200
committer Takashi Iwai <tiwai@suse.de> 1245936494 +0200

Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc

Conflicts:
	MAINTAINERS