From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Nov 2010 15:38:58 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: firefly_0821_release~7613^2~3407
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70b99eff756e8995b607a9d33f242c1e4f480f32;p=firefly-linux-kernel-4.4.55.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: Update a BKL related comment
  powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
  powerpc: Fix call to subpage_protection()
  powerpc: Set CONFIG_32BIT on ppc32
  powerpc/mm: Fix build error in setup_initial_memory_limit
  powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
  powerpc: Fix div64 in bootloader
---

70b99eff756e8995b607a9d33f242c1e4f480f32