]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96da4e5 54d96a4)
Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 17:52:51 +0000 (17:52 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 17:52:51 +0000 (17:52 +0000)
Conflicts:
sound/soc/codecs/rt286.c

1  2 
sound/soc/codecs/rt286.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/rt286.c
Simple merge
A mirror of Linus' kernel repository