]> 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@linux-foundation.org>
Tue, 5 Aug 2008 00:25:06 +0000 (17:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:25:06 +0000 (17:25 -0700)
commit3b60bc37fa5f71b4bc3869d3f8f36b1813c0e49b
tree82afbba3d073ce903cb737412b6eccdf8adab4b5
parent67970aa8a6abcb3d2679b69a5e4fdc20eda20d8d
parentca6c186d35e649cb760aa298360eee3e7742d7e9
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: Remove use of CONFIG_PPC_MERGE
  powerpc: Force printing of 'total_memory' to unsigned long long
  powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
  powerpc: Move include files to arch/powerpc/include/asm