tree 216878cb17332441563797ed8768f45fee4ab198
parent 701b259f446be2f3625fb852bceb93afe76e206d
parent 3493c85366ba09c9d0972c919e7123367a39982a
author Linus Torvalds <torvalds@linux-foundation.org> 1327468671 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1327468671 -0800

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix build on some non-freescale platforms
  powerpc/powernv: Fix PCI resource handling
  powerpc/crash: Fix build error without SMP
  powerpc/cpuidle: Make it a bool, not a tristate
  powerpc/85xx: Add dr_mode property in USB nodes
  powerpc/85xx: Enable USB2 controller node for P1020RDB
  powerpc/85xx: Fix cmd12 bug and add the chip compatible for eSDHC
  arch/powerpc/sysdev/fsl_pci.c: add missing iounmap
  powerpc: fix compile error with 85xx/p1022_ds.c