]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6268f74) | patch
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)
commitc3c9b370ea4fa2566dfb0c3d88d9f02be0533e7a
treeb1c0803a13255e6c5117b8a6c0c4d5ecac3373d3tree
parent6268f74990c7fab6727bcb2dc82b3c4d4b302317commit | diff
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 diff | blob | blame | history
Ubuntu combined Linux kernel mirror