[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few things still for .30 for you to merge !

Cheers,
Ben.

The following changes since commit 091438dd5668396328a3419abcbc6591159eb8d1:
  Linus Torvalds (1):
        Linux 2.6.30-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (1):
      powerpc: Fix setting of oprofile cpu type

Grant Likely (1):
      powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries

Michael Wolf (1):
      powerpc adjust oprofile_cpu_type version 3

 MAINTAINERS                    |    4 ++--
 arch/powerpc/kernel/cputable.c |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)