Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile
No related branches found
No related tags found
Showing
- sound/soc/fsl/fsl_ssi.c 2 additions, 2 deletionssound/soc/fsl/fsl_ssi.c
- sound/soc/fsl/imx-wm8962.c 1 addition, 0 deletionssound/soc/fsl/imx-wm8962.c
- sound/soc/generic/simple-card.c 3 additions, 4 deletionssound/soc/generic/simple-card.c
- sound/soc/intel/sst-firmware.c 7 additions, 6 deletionssound/soc/intel/sst-firmware.c
- sound/soc/intel/sst-haswell-ipc.c 30 additions, 0 deletionssound/soc/intel/sst-haswell-ipc.c
- sound/soc/omap/omap-mcbsp.c 1 addition, 1 deletionsound/soc/omap/omap-mcbsp.c
- sound/soc/rockchip/rockchip_i2s.c 1 addition, 0 deletionssound/soc/rockchip/rockchip_i2s.c
- sound/soc/soc-compress.c 6 additions, 3 deletionssound/soc/soc-compress.c
- tools/perf/scripts/perl/Perf-Trace-Util/Context.c 4 additions, 1 deletiontools/perf/scripts/perl/Perf-Trace-Util/Context.c
- tools/perf/util/annotate.c 14 additions, 4 deletionstools/perf/util/annotate.c
- tools/perf/util/evlist.c 1 addition, 1 deletiontools/perf/util/evlist.c
- tools/perf/util/map.h 16 additions, 0 deletionstools/perf/util/map.h
- tools/perf/util/probe-event.c 16 additions, 18 deletionstools/perf/util/probe-event.c
- tools/perf/util/symbol.c 28 additions, 3 deletionstools/perf/util/symbol.c
- tools/perf/util/symbol.h 1 addition, 0 deletionstools/perf/util/symbol.h
Loading
Please register or sign in to comment