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)
commit371858568e02698fe2de8ba4bf771e3f40db69e5
tree07ec799d7babae7eafda93d9dfd9d11fccff086f
parente82b0f2cc21be905e504573483fa9542b15df96f
parent54f4ee183aea859eb09f141dad3fc3c6f4fe0446
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

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