tree c7fcfd4ad7ad1875e611db3a2bd75d64f603c355
parent 6bfb6aa91f61f2a7c526a6353c8c50676ca528da
parent a532f97c71c7a952531e02b0994104c532fbef0f
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1281880600 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1281880600 +0100

Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37

Trivial overlap with the removal of the local revision variable.

Conflicts:
	sound/soc/codecs/wm8994.c