diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 09:14:47 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 09:14:47 +0300 |
| commit | 9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd (patch) | |
| tree | 966b838e2190a7d6868cda5f4eee6d0f490da27c /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | video: vt8500: fix Kconfig for videomode (diff) | |
| parent | fbdev: fix check for fb_mmap's mmio availability (diff) | |
| download | wireguard-linux-9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd.tar.xz wireguard-linux-9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd.zip | |
Merge branch '3.10/fb-mmap' into for-next
Merge topic branch to get vm_iomap_memory into use.
Conflicts:
drivers/video/fbmon.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions