]> Git Repo - linux.git/commitdiff
Merge tag 'v4.0-rc3' into asoc-rt5670
authorMark Brown <[email protected]>
Tue, 10 Mar 2015 10:37:02 +0000 (10:37 +0000)
committerMark Brown <[email protected]>
Tue, 10 Mar 2015 10:37:02 +0000 (10:37 +0000)
Linux 4.0-rc3

Conflicts:
sound/soc/codecs/rt5670.c

1  2 
sound/soc/codecs/rt5670.c

Simple merge
This page took 0.068759 seconds and 4 git commands to generate.