From: Linus Torvalds Date: Fri, 19 Sep 2008 23:05:05 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9719635f85b1d3c54775b53ea45fdd8e7496682;p=linux-2.6 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: Fix compile failure with non modular builds powerpc: Holly board needs dtbImage target powerpc: Fix interrupt values for DMA2 in MPC8610 HPCD device tree --- b9719635f85b1d3c54775b53ea45fdd8e7496682