summaryrefslogtreecommitdiff
path: root/Documentation/frv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-03 06:49:50 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-03 06:49:50 +0400
commitd4509e5a6edf8862c18d887a642ce4994bde297d (patch)
tree51669f2e0fa6004fb02c5907c2957a48d025c2a1 /Documentation/frv
parent0afa80ab6ff9aac57f118463699cee306ad6ed8a (diff)
parented01f64b831481762437c8eedddcca8481dc7f67 (diff)
downloadlinux-d4509e5a6edf8862c18d887a642ce4994bde297d.tar.xz
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them powerpc/fsl: add device tree binding for QE firmware of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree
Diffstat (limited to 'Documentation/frv')
0 files changed, 0 insertions, 0 deletions