rtime.felk.cvut.cz Git - lisovros/linux

author	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 20 May 2008 15:15:34 +0000 (08:15 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 20 May 2008 15:15:34 +0000 (08:15 -0700)

* '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

		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge