• Linus Torvalds's avatar
    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 553cbf0a
    Linus Torvalds authored
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/ps3: Update ps3_defconfig
      powerpc/ps3: Update platform maintainer
      powerpc/pseries: Flush lazy kernel mappings after unplug operations
      powerpc/numa: Add form 1 NUMA affinity
      powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32
      powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
      powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED
      powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
      powerpc/83xx: enable EPOLL syscall in defconfig
      powerpc/83xx: add RTC drivers in 83xx defconfig
      powerpc/fsl-cpm: Configure clock correctly for SCC
      powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS
      powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
    553cbf0a
MAINTAINERS 166 KB