Public Git Hosting - linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 6bfb6aa a532f97)

commit	ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 15 Aug 2010 13:56:40 +0000 (15 14:56 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 15 Aug 2010 13:56:40 +0000 (15 14:56 +0100)
tree	c7fcfd4ad7ad1875e611db3a2bd75d64f603c355	tree \| snapshot (tar.gz zip)
parent	6bfb6aa91f61f2a7c526a6353c8c50676ca528da	commit \| diff
parent	a532f97c71c7a952531e02b0994104c532fbef0f	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/ad1980.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/ad1980.h	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8580.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8994.c	diff1 \|	diff2 \|	blob \| history
sound/soc/imx/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-cache.c	diff1 \|	diff2 \|	blob \| history

Linux 2.6 ibm-acpi/thinkpad-acpi driver git tree