projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 207bc11 bdf0eb3)
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)
* pnp:
  pnp: restore automatic resolution of DMA conflicts


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.