Merge branch 'topic/workq-update' into topic/misc
[pandora-kernel.git] / sound / aoa / core / gpio-pmf.c
Simple merge