From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jul 2012 02:52:25 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v4.13~11581
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9d4056aa9efa07015aa6da11ae2e72f22dc55c97;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull a couple more powerpc fixes from Benjamin Herrenschmidt:
 "Here are two more fixes that I "missed" when scrubbing patchwork last
  week which are worth still having in 3.5."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/kvm: sldi should be sld
  powerpc/xmon: Use cpumask iterator to avoid warning
---

9d4056aa9efa07015aa6da11ae2e72f22dc55c97