diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:45:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:45:22 +0100 |
| commit | fb4f0424293a0fb75d0c9edbc16bd618930ff2da (patch) | |
| tree | 65a27a478b52ac1208ff135009ea809c0dc5acdb /tools/perf/scripts/python/syscall-counts.py | |
| parent | 35d3aad49223aaf9f54510145fd674134e117321 (diff) | |
| parent | b28210421c329766275b020ffeadce0a4e9d551f (diff) | |
Merge branch 's3c64xx/multiplatform' into next/multiplatform
* s3c64xx/multiplatform:
ARM: s3c64xx: allow building without board support
ARM: s3c64xx: multiplatform support
ARM: s3c64xx: use common debug-ll implementation
ARM: s3c64xx: use new adc/touchscreen driver
iio: exynos-adc: add experimental touchscreen support
ARM: s3c64xx: enable sparse IRQ support
ARM: s3c64xx: prepare initcalls for multiplatform
gpio: samsung: move gpio-samsung driver back to platform code
ASoC: samsung/smartq: use dynamic registration
Input: s3c2410_ts: fix S3C_ADC dependency
Conflicts:
arch/arm/Kconfig.debug
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions