Commits

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
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