Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 04:02:42 +0000 (21:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 04:02:42 +0000 (21:02 -0700)
commit1989425a3aed215f1accd5d8019b18b345166a63
treeedf01f8cddce137588a501d74eedb43e98911c62
parent0fc2f137226eff4c9dd90864dda5c237474c3ec5
parente32e78c5ee8aadef020fbaecbe6fb741ed9029fd
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