From: Arnd Bergmann Date: Thu, 25 Sep 2014 16:06:05 +0000 (+0200) Subject: Merge tag 'pxa3xx-ssp-name' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuan... X-Git-Tag: fixes-for-v3.18-merge-window~5^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a508698e6bbe38a3f34dd7e611931c0c8fabc213;p=pandora-kernel.git Merge tag 'pxa3xx-ssp-name' of https://git./linux/kernel/git/hzhuang1/linux into next/soc Pull "fix PXA3xx SSP naming issue" from Haojian Zhuang: It's imported by 972a55b62 ASoC: fix pxa-ssp compiling issue under mach-mmp from v3.5 Signed-off-by: Arnd Bergmann * tag 'pxa3xx-ssp-name' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux: ARM: pxa3xx: provide specific platform_devices for all ssp ports ARM: pxa: ssp: provide platform_device_id for PXA3xx --- a508698e6bbe38a3f34dd7e611931c0c8fabc213 Reading git-diff-tree failed