Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 15:15:34 +0000 (08:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 15:15:34 +0000 (08:15 -0700)
commitbca39da5645c72048e8854340575c338b8100bca
treee7ef9ac8f86367b2af3b1eef6c19f717f77eb89a
parent551395ae667d699189014f762355e9131fc03e79
parent09c201219b000c5d79a7a7ebeb2f9768e97224fc
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Update defconfigs for desktop/server systems
  [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
  [POWERPC] Update arch/powerpc/boot/.gitignore
  [POWERPC] Remove generated files on make clean
  [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
  [POWERPC] Update Cell MAINTAINERS entry, add spufs entry
  lmb: Fix compile warning
MAINTAINERS