Merge branch 'topic/bkl' into topic/core-cleanup
[pandora-kernel.git] / sound / core / timer.c
Simple merge