From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 15 Jun 2013 22:30:24 +0000 (+0200)
Subject: Merge branch 'pnp' into linux-next
X-Git-Tag: next-20130617~79^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51dcfbeb8b86018f488881bb0a999391b3ad55a6;p=karo-tx-linux.git

Merge branch 'pnp' into linux-next

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

51dcfbeb8b86018f488881bb0a999391b3ad55a6