]> 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: dcf6533 40f2729)
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)
* pnp-next:
  pnp: restore automatic resolution of DMA conflicts


Trivial merge
Linux kernel for KaRo TX COM modules