Skip to content
Commit 744c5578 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6 

* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of/dma: fix build breakage in ppc4xx adma driver
parents 62fd9857 3e6b02d9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment