Merge branch 'topic/core-cleanup' into for-linus
Takashi Iwai [Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)]
1  2 
sound/core/pcm_native.c
sound/core/timer.c

Simple merge
Simple merge