Learn more about cloning repositories
You have read-only access
Merge branch 'for-2.6.38' into for-2.6.39 Conflicts: sound/soc/codecs/wm8978.c sound/soc/soc-dapm.c