From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Apr 2010 02:49:50 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: firefly_0821_release~9833^2~2440
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d4509e5a6edf8862c18d887a642ce4994bde297d;p=firefly-linux-kernel-4.4.55.git

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
---

d4509e5a6edf8862c18d887a642ce4994bde297d