Merge branch 'pnp'

Browse source

* pnp:
  pnp: restore automatic resolution of DMA conflicts

...

This commit is contained in:

Rafael J. Wysocki 2013-06-28 13:00:57 +02:00

parent 207bc1181b bdf0eb3a02

commit 3e79a8a67d

1 changed files with 9 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

drivers/pnp/manager.c

View file