Merge branch 'topic/bkl' into topic/core-cleanup

author Takashi Iwai <[email protected]>

Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)

committer Takashi Iwai <[email protected]>

Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
author Takashi Iwai <[email protected]>
Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
committer Takashi Iwai <[email protected]>
Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
diff --cc sound/core/info.c
Simple merge
diff --cc sound/usb/caiaq/device.c
Simple merge
author	Takashi Iwai <[email protected]>
	Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
committer	Takashi Iwai <[email protected]>
	Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
		1	2
sound/core/info.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/caiaq/device.c	patch \|	diff1 \|	diff2 \|	blob \| history