Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:05:05 +0000 (16:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:05:05 +0000 (16:05 -0700)
commitb9719635f85b1d3c54775b53ea45fdd8e7496682
treedff7ad76a8fe973f46b2b959a28f12d3f47cb3d5
parente72a68fc26887d2097fd7f14794aeb7c17851a5d
parent2d291e902791e1c8d72bc223b6f063bbb27a1280
Merge branch 'merge' of git://git./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