Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 27 May 2006 16:40:40 +0000 (09:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 27 May 2006 16:40:40 +0000 (09:40 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [PATCH] powerpc: fix RTC/NVRAM accesses on Maple
  [PATCH] ppc32 CPM_UART: various fixes for pq2 uart users
  [PATCH] powerpc: linuxppc64.org no more

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge