Merge tag 'pxa3xx-ssp-name' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuan...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 16:06:05 +0000 (18:06 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 16:06:05 +0000 (18:06 +0200)
commita508698e6bbe38a3f34dd7e611931c0c8fabc213
tree7e9f375bae26b9d3aa2ae9831d7b5708979a5d1f
parent14b62fb0159a77989708370ca8c8ba5db55c1dab
parent0da0e227477fdf7c7712ab973621630ba88aebcb
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 <arnd@arndb.de>
* 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