Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 11:00:57 +0000 (13:00 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 11:00:57 +0000 (13:00 +0200)
commit3e79a8a67d6f28b2b1d4344253ca612e77cca8e6
treee33eb07f35c50458e2262b784f330bc4a32a7cb9
parent207bc1181b1c03ab6ecb55bca5b307606dd1d6bc
parentbdf0eb3a026922dbf57f6839f3184c8d2ecc5f2e
Merge branch 'pnp'

* pnp:
  pnp: restore automatic resolution of DMA conflicts