Merge branch 'topic/asoc' into for-linus

author Takashi Iwai <tiwai@suse.de>

Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)

committer Takashi Iwai <tiwai@suse.de>

Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)
author Takashi Iwai <tiwai@suse.de>
Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)
committer Takashi Iwai <tiwai@suse.de>
Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)
diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge
diff --cc arch/sh/boards/mach-ecovec24/setup.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)
		1	2
arch/arm/mach-shmobile/board-ag5evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sh/boards/mach-ecovec24/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history