summaryrefslogtreecommitdiff
path: root/include/linux/davinci_emac.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-05 07:12:31 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-05 07:12:31 +0400
commit744c557892d3bfb575287ee95947f5c0b9a0458f (patch)
tree02e75a88f2f0472bca3515e08c8c12468b7d1797 /include/linux/davinci_emac.h
parent62fd98571727a22ef77f1a9c1637260ad5a10baa (diff)
parent3e6b02d9f5a9715f7d4ff9e0978e5f9cef53d31f (diff)
downloadlinux-744c557892d3bfb575287ee95947f5c0b9a0458f.tar.xz
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
Diffstat (limited to 'include/linux/davinci_emac.h')
0 files changed, 0 insertions, 0 deletions