Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
[pandora-kernel.git] / Documentation / cpu-hotplug.txt
Simple merge