diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-03 04:49:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-03 04:49:50 +0200 |
| commit | d4509e5a6edf8862c18d887a642ce4994bde297d (patch) | |
| tree | 51669f2e0fa6004fb02c5907c2957a48d025c2a1 /arch/sparc | |
| parent | Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them (diff) | |
| download | linux-d4509e5a6edf8862c18d887a642ce4994bde297d.tar.xz linux-d4509e5a6edf8862c18d887a642ce4994bde297d.zip | |
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 '')
0 files changed, 0 insertions, 0 deletions