Merge branch 'topic/bkl' into topic/core-cleanup
Takashi Iwai [Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)]
1  2 
sound/core/info.c
sound/usb/caiaq/device.c

Simple merge
Simple merge