From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 11:00:57 +0000 (+0200)
Subject: Merge branch 'pnp'
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~19^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e79a8a67d6f28b2b1d4344253ca612e77cca8e6;p=pandora-kernel.git

Merge branch 'pnp'

* pnp:
  pnp: restore automatic resolution of DMA conflicts
---

3e79a8a67d6f28b2b1d4344253ca612e77cca8e6
Reading git-diff-tree failed