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)
commit6250b9ced23032789ca9739d6a53949637f9c836
tree62379e6b563b45331f8d5d788e8ba7089b2fbaba
parent8b296c8f9f660b70e958e6e6b9b4293e6ae854f2
parentc32d977b8157bf67cdf47729ce7dd054a26eb534
Merge branch 'topic/noncached-mmap' into topic/misc
include/sound/pcm.h
sound/core/pcm_native.c