diff options
| author |   Kukjin Kim <kgene.kim@samsung.com> | 2012-09-22 12:17:37 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-22 12:17:37 +0900 |
| commit | a0cabc4017a78643e26d7bd79bcac548410f0480 (patch) | |
| tree | 83bb72392d38c59a0eacbcfc7a794332aaed1a53 /tools/perf/scripts/python/syscall-counts.py | |
| parent | Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new (diff) | |
| parent | ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen (diff) | |
| download | linux-dev-a0cabc4017a78643e26d7bd79bcac548410f0480.tar.xz linux-dev-a0cabc4017a78643e26d7bd79bcac548410f0480.zip | |
Merge branch 'next/dt-samsung' into next/dt-samsung-new
Conflicts:
arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions