Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 15:25:37 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 15:25:37 +0000 (08:25 -0700)
commit32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b
treeb095b022c36d61ae5326d3468e937e59cc1576a6
parenta31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69
parent0203d6ec4e88062f20558fbed3cdff2af758a53b
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix setting of oprofile cpu type
  powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
  powerpc adjust oprofile_cpu_type version 3
MAINTAINERS