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

Simple merge