]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita69f0034204395b37041cd57b8ed6b41b67ec568
treeb0176955acf09d94f1e6754b2b9653720cb50b45
parentf6bb985f63082ac301fb1f01c9c864c90d0c3d2c
parent6113a22dbcc3037df711688f4a433f1372a181a9
Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-w-codec

Conflicts:
sound/soc/codecs/rt286.c
sound/soc/codecs/rt286.c