diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 10:06:37 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 10:06:37 -0800 |
| commit | 912cbd495204ee6fcb67b8704ffbda10615d1f2f (patch) | |
| tree | 1053bc0bf681a7a4448b5344dddb5f425e0b7920 /tools/perf/scripts/python/syscall-counts.py | |
| parent | staging: line6: Add support for POD HD400 to line6usb driver (diff) | |
| parent | Linux 3.13-rc5 (diff) | |
Merge 3.13-rc5 into staging-next
This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions