]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/bkl' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 9 Apr 2010 15:36:43 +0000 (17:36 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 9 Apr 2010 15:36:43 +0000 (17:36 +0200)
1  2 
sound/core/pcm_native.c

Simple merge