From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4509e5a6edf8862c18d887a642ce4994bde297d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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