From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 04:02:42 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: firefly_0821_release~9833^2~1044
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1989425a3aed215f1accd5d8019b18b345166a63;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: fix build with make 3.82
  Revert "Input: appletouch - fix integer overflow issue"
  memblock: Fix memblock_is_region_reserved() to return a boolean
  powerpc: Trim defconfigs
  powerpc: fix i8042 module build error
  sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
  powerpc/5200: add mpc5200_psc_ac97_gpio_reset
---

1989425a3aed215f1accd5d8019b18b345166a63