]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:51:32 +0000 (12:51 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:51:32 +0000 (12:51 +0100)
1  2 
sound/pci/oxygen/oxygen_lib.c

Simple merge