1. 13 Mar, 2008 2 commits
    • Paul Mackerras's avatar
      Merge branch 'linux-2.6' · bed04a44
      Paul Mackerras authored
      bed04a44
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · c463be35
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (22 commits)
        [POWERPC] Fix large hash table allocation on Cell blades
        [POWERPC] Export empty_zero_page
        [POWERPC] Fix viodasd driver with scatterlist debug
        [POWERPC] Fix arch/powerpc/platforms/powermac/pic.c when !CONFIG_ADB_PMU
        [POWERPC] Fix drivers/macintosh/mediabay.c when !CONFIG_ADB_PMU
        [POWERPC] Fix undefined pmu_sys_suspended compilation error
        [POWERPC] Fix build of modular drivers/macintosh/apm_emu.c
        [POWERPC] Fix sleep on some powerbooks
        [POWERPC] Fix bogus test for unassigned PCI resources
        [POWERPC] Fix zImage-dtb.initrd build error
        [POWERPC] Add __ucmpdi2 for 64-bit comparisons in 32-bit kernels
        [POWERPC] spufs: fix rescheduling of non-runnable contexts
        [POWERPC] spufs: don't (ab)use SCHED_IDLE
        [POWERPC] QE: Make qe_get_firmware_info reentrant
        [POWERPC] 83xx: Make 83xx perfmon support selectable
        [PPC] 8xx: swap bug-fix
        [POWERPC] 85xx: sbc8548 - Fix incorrect PCI-X and PCI interrupt map
        [POWERPC] QE: Fix QE firmware uploading limit
        [POWERPC] 8xx: Fix wrapper platform for adder875, and combine defconfigs.
        [POWERPC] 8xx: fix swap
        ...
      c463be35
  2. 12 Mar, 2008 38 commits