diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 22:49:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 22:49:50 -0400 |
| commit | d4509e5a6edf8862c18d887a642ce4994bde297d (patch) | |
| tree | 51669f2e0fa6004fb02c5907c2957a48d025c2a1 /include/linux | |
| parent | 0afa80ab6ff9aac57f118463699cee306ad6ed8a (diff) | |
| parent | ed01f64b831481762437c8eedddcca8481dc7f67 (diff) | |
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 'include/linux')
0 files changed, 0 insertions, 0 deletions