395ae667d699189014f762355e9131fc03e79
parent 09c201219b000c5d79a7a7ebeb2f9768e97224fc
author Linus Torvalds <torvalds@linux-foundation.org> 1211296534 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211296534 -0700

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:
  [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
ùdŽŸ