]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: bells: Fix up git patch application failure
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 16 Nov 2012 00:26:41 +0000 (09:26 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 16 Nov 2012 00:30:56 +0000 (09:30 +0900)
commit33198c1605870985e7b7e32ebf80f18a41e78d16
treeb1c0803a13255e6c5117b8a6c0c4d5ecac3373d3
parent112ce37e308ed64d8ebc13077141928b16842030
ASoC: bells: Fix up git patch application failure

It seems git has been getting confused by the very similar contexts
for the speaker DAIs and has been applying patches to the wrong places
causing all sorts of confusion.  Fix this up by hand.

Reported-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/samsung/bells.c