tree 6d40c11613357f8390a369acdd7976a72aca8b86
parent dd38d298385cb054263e634cf94cf18dc3ae1fc1
parent 49e44064d7e3f24f874a51dd513b83ef9994aa8a
author Linus Torvalds <torvalds@linux-foundation.org> 1322330012 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1322330012 -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/44x: Add mtd ndfc to the ppx44x defconfig
  powerpc: Fix compiliation with hugetlbfs enabled
  arch/powerpc/sysdev/ehv_pic.c: add missing kfree
  powerpc/fsl-lbc: Fix for fsl_upm
  drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
  powerpc/qe: Fixup QE_General4 errata
  powerpc/85xx: Fix compile error on p3060_qds.c
  powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO'
  powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe