From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Aug 2008 00:25:06 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: firefly_0821_release~18433
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2acb802b0c5485aedb46e23b2b45e49573454c09;p=firefly-linux-kernel-4.4.55.git

Merge branch 'merge' of git://git./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
---

2acb802b0c5485aedb46e23b2b45e49573454c09