]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pnp' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 15 Jun 2013 22:30:24 +0000 (00:30 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 15 Jun 2013 22:30:24 +0000 (00:30 +0200)
commit51dcfbeb8b86018f488881bb0a999391b3ad55a6
treec277be493a510417831da0b97a979279760de661
parent3bd0f0e4973efe66e2a1ef2ec78f39cf8883322e
parentbdf0eb3a026922dbf57f6839f3184c8d2ecc5f2e
Merge branch 'pnp' into linux-next

* pnp:
  pnp: restore automatic resolution of DMA conflicts