diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:00:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:00:57 +0200 |
| commit | 3e79a8a67d6f28b2b1d4344253ca612e77cca8e6 (patch) | |
| tree | e33eb07f35c50458e2262b784f330bc4a32a7cb9 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'freezer' (diff) | |
| parent | pnp: restore automatic resolution of DMA conflicts (diff) | |
| download | linux-dev-3e79a8a67d6f28b2b1d4344253ca612e77cca8e6.tar.xz linux-dev-3e79a8a67d6f28b2b1d4344253ca612e77cca8e6.zip | |
Merge branch 'pnp'
* pnp:
pnp: restore automatic resolution of DMA conflicts
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions