1. 07 12月, 2006 2 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · dd6a7c19
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (43 commits)
        sh: sh775x/titan fixes for irq header changes.
        sh: update r7780rp defconfig.
        sh: compile fixes for header cleanup.
        sh: Fixup pte_mkhuge() build failure.
        sh: set KBUILD_IMAGE to something sensible.
        sh: show held locks in stack trace with lockdep.
        sh: platform_pata support for R7780RP
        sh: stacktrace/lockdep/irqflags tracing support.
        sh: Fixup movli.l/movco.l atomic ops for gcc4.
        sh: dyntick infrastructure.
        sh: Clock framework tidying.
        sh: Turn off IRQs around get_timer_offset() calls.
        sh: Get the PGD right in oops case with 64-bit PTEs.
        sh: Fix store queue bitmap end.
        sh: More flexible + SH7780 earlyprintk SCIF support.
        sh: Fixup various PAGE_SIZE == 4096 assumptions.
        sh: Fixup 4K irq stacks.
        sh: dma-api channel capability extensions.
        sh: Drop name overload in dma-sh.
        sh: Make dma-isa depend on ISA_DMA_API.
        ...
      dd6a7c19
    • L
      Merge git://git.infradead.org/users/dhowells/workq-2.6 · dd8856bd
      Linus Torvalds 提交于
      * git://git.infradead.org/users/dhowells/workq-2.6:
        Actually update the fixed up compile failures.
        WorkQueue: Fix up arch-specific work items where possible
        WorkStruct: make allyesconfig
        WorkStruct: Pass the work_struct pointer instead of context data
        WorkStruct: Merge the pending bit into the wq_data pointer
        WorkStruct: Typedef the work function prototype
        WorkStruct: Separate delayable and non-delayable events.
      dd8856bd
  2. 06 12月, 2006 38 次提交