diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:06:05 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:06:05 +0200 |
commit | a508698e6bbe38a3f34dd7e611931c0c8fabc213 (patch) | |
tree | 7e9f375bae26b9d3aa2ae9831d7b5708979a5d1f /tools/perf/util/trace-event-scripting.c | |
parent | 14b62fb0159a77989708370ca8c8ba5db55c1dab (diff) | |
parent | 0da0e227477fdf7c7712ab973621630ba88aebcb (diff) |
Merge tag 'pxa3xx-ssp-name' of https://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions