]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 065ae67 c88c282)
Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 18 Jan 2011 19:11:23 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 18 Jan 2011 19:11:23 +0000 (19:11 +0000)
1  2 
sound/soc/codecs/Kconfig patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.