]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Jun 2013 19:40:53 +0000 (21:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Jun 2013 19:40:53 +0000 (21:40 +0200)
commit61d39b11e77549b25870b8c71231ff9e09ff6e6a
tree6571cdb189b48b15e8257aed123d8a47c8bc07e4
parentf0c6b3e20022c9fb11bcf44018c292af95a33945
parentbdf0eb3a026922dbf57f6839f3184c8d2ecc5f2e
Merge branch 'pnp'

* pnp:
  pnp: restore automatic resolution of DMA conflicts