| commit | 3e79a8a67d6f28b2b1d4344253ca612e77cca8e6 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Jun 28 13:00:57 2013 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Jun 28 13:00:57 2013 +0200 |
| tree | e33eb07f35c50458e2262b784f330bc4a32a7cb9 | |
| parent | 207bc1181b1c03ab6ecb55bca5b307606dd1d6bc [diff] | |
| parent | bdf0eb3a026922dbf57f6839f3184c8d2ecc5f2e [diff] |
Merge branch 'pnp' * pnp: pnp: restore automatic resolution of DMA conflicts