diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 11:00:57 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 11:00:57 (GMT) |
| commit | 3e79a8a67d6f28b2b1d4344253ca612e77cca8e6 (patch) | |
| tree | e33eb07f35c50458e2262b784f330bc4a32a7cb9 /drivers/thermal | |
| parent | 207bc1181b1c03ab6ecb55bca5b307606dd1d6bc (diff) | |
| parent | bdf0eb3a026922dbf57f6839f3184c8d2ecc5f2e (diff) | |
| download | linux-fsl-qoriq-3e79a8a67d6f28b2b1d4344253ca612e77cca8e6.tar.xz | |
Merge branch 'pnp'
* pnp:
pnp: restore automatic resolution of DMA conflicts
Diffstat (limited to 'drivers/thermal')
0 files changed, 0 insertions, 0 deletions