From: Takashi Iwai <tiwai@suse.de> Date: Wed, 15 Apr 2009 09:24:14 +0000 (+0200) Subject: Merge branch 'topic/asoc' into for-linus X-Git-Tag: firefly_0821_release~14450^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=035f5afb022451b6b4f7ca1ff65a43d7ea8154a1;p=firefly-linux-kernel-4.4.55.git Merge branch 'topic/asoc' into for-linus * topic/asoc: ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h --- 035f5afb022451b6b4f7ca1ff65a43d7ea8154a1