diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:41 +0100 |
| commit | ccfa8b21f20099b950b4f2f75d2330fb149a2012 (patch) | |
| tree | 60380e1417830f50683c3945e2fb9ee110418cbb /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'imx/devel' into imx/imx6q (diff) | |
| parent | arm/imx: use Kconfig choice for low-level debug UART selection (diff) | |
| download | wireguard-linux-ccfa8b21f20099b950b4f2f75d2330fb149a2012.tar.xz wireguard-linux-ccfa8b21f20099b950b4f2f75d2330fb149a2012.zip | |
Merge branch 'cross-platform/debug_ll' into imx/imx6q
Conflicts:
arch/arm/Kconfig.debug
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions