Merge branch 'topic/asoc' into for-linus
Takashi Iwai [Wed, 16 Mar 2011 16:38:41 +0000 (17:38 +0100)]
1  2 
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/sh/boards/mach-ecovec24/setup.c

Simple merge
Simple merge
Simple merge