]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0c6b3e bdf0eb3)
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)
* pnp:
  pnp: restore automatic resolution of DMA conflicts


Trivial merge
Linux kernel for KaRo TX COM modules