1. 07 Nov, 2011 2 commits
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 1197ab29
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
        powerpc/p3060qds: Add support for P3060QDS board
        powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
        powerpc/85xx: Make kexec to interate over online cpus
        powerpc/fsl_booke: Fix comment in head_fsl_booke.S
        powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
        powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
        powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
        powerpc/86xx: Correct Gianfar support for GE boards
        powerpc/cpm: Clear muram before it is in use.
        drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
        powerpc/fsl_msi: add support for "msi-address-64" property
        powerpc/85xx: Setup secondary cores PIR with hard SMP id
        powerpc/fsl-booke: Fix settlbcam for 64-bit
        powerpc/85xx: Adding DCSR node to dtsi device trees
        powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
        powerpc/85xx: fix PHYS_64BIT selection for P1022DS
        powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
        powerpc: respect mem= setting for early memory limit setup
        powerpc: Update corenet64_smp_defconfig
        powerpc: Update mpc85xx/corenet 32-bit defconfigs
        ...
      
      Fix up trivial conflicts in:
       - arch/powerpc/configs/40x/hcu4_defconfig
      	removed stale file, edited elsewhere
       - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
      	added opal and gelic drivers vs added ePAPR driver
       - drivers/tty/serial/8250.c
      	moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support
      1197ab29
    • Linus Torvalds's avatar
      Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · ec773e99
      Linus Torvalds authored
      * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
        ARM: PXA: fix gpio-pxa.h build errors
        ARM: 7142/1: davinci: mark GPIO implementation complex
        ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
        ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
        ARM: PXA: fix lubbock PCMCIA driver build error
      ec773e99
  2. 06 Nov, 2011 18 commits
  3. 05 Nov, 2011 20 commits