]> 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: 3bd0f0e bdf0eb3)
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)
* pnp:
  pnp: restore automatic resolution of DMA conflicts


Trivial merge
Linux kernel for KaRo TX COM modules