git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0afa80a ed01f64)
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:49:50 +0000 (19:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:49:50 +0000 (19:49 -0700)
* '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


Trivial merge
Full containers within linux kernel