]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ce5531 eee7663)
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)
commit6f56a36a2448d33201abccc4a23f2bbdf7ac0b19
treec7fcfd4ad7ad1875e611db3a2bd75d64f603c355tree | snapshot
parent8ce5531d49a5f188e3158d282cf23a0539bb2b06commit | diff
parenteee76637507375e544ab721b97ca8cb2cc7eddd3commit | diff
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
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 Kernel Source Tree.