Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 15 Aug 2010 13:56:40 +0000 (14:56 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 15 Aug 2010 13:56:40 +0000 (14:56 +0100)
commitec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1
treec7fcfd4ad7ad1875e611db3a2bd75d64f603c355
parent6bfb6aa91f61f2a7c526a6353c8c50676ca528da
parenta532f97c71c7a952531e02b0994104c532fbef0f
Merge branch 'for-2.6.36' of git://git./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
sound/soc/blackfin/bf5xx-ad1980.c
sound/soc/codecs/ad1980.c
sound/soc/codecs/ad1980.h
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8994.c
sound/soc/imx/Kconfig
sound/soc/soc-cache.c