From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 May 2009 15:25:37 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.30-rc5~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b;p=platform%2Fkernel%2Flinux-3.10.git

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

32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b