]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 15 Jun 2011 13:20:09 +0000 (15:20 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 15 Jun 2011 13:20:09 +0000 (15:20 +0200)
1  2 
sound/pci/lola/lola.c

Simple merge