]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc9c0e8a42e707a67fb54349e797655c893b217a8
treeb095b022c36d61ae5326d3468e937e59cc1576a6
parentfd646f8b4d2d512e780bc8155e484a5d4ca9d05a
parente10295a463644336bea1fba54b315d3a8d006714
Merge branch 'merge' of git://git.kernel.org/pub/scm/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