]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Dec 2007 18:37:46 +0000 (10:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Dec 2007 18:37:46 +0000 (10:37 -0800)
commita2825f7bce11b7b897e24b9f393d1c33608828c5
treeaff68702c9477c21b26284346ba98feebc91d849
parent2063a77e99e38dce42d7fd6eb6c992868778b3c4
parent12ac92cab7e7c645eb83b01f6f20237eab5ff6a4
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] PS3: Fix printing of os-area magic numbers
  [POWERPC] Oprofile: Remove dependency on spufs module