Merge branch 'topic/noncached-mmap' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Thu, 21 Jan 2010 14:27:28 +0000 (15:27 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 21 Jan 2010 14:27:28 +0000 (15:27 +0100)
1  2 
include/sound/pcm.h
sound/core/pcm_native.c

Simple merge
Simple merge