]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pnp-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 16 May 2013 09:00:31 +0000 (11:00 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 16 May 2013 09:00:31 +0000 (11:00 +0200)
commitfe4ae24ecd327577753fed32e694788102564762
tree880528d13f3a4622600dd0e8b045b941e3b90b54
parentdcf6533a700ac85b64b995f628b3e86cba74a377
parent40f2729734e500fc96bf246be8fb6d2ce2502d3b
Merge branch 'pnp-next' into linux-next

* pnp-next:
  pnp: restore automatic resolution of DMA conflicts