1. 18 1月, 2011 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 · af575e2d
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
        alpha: fix WARN_ON in __local_bh_enable()
        alpha: fix breakage caused by df9ee292
        alpha: add GENERIC_HARDIRQS_NO__DO_IRQ to Kconfig
        alpha/osf_sys: remove unused MAX_SELECT_SECONDS
        alpha: change to new Makefile flag variables
        alpha: kill off alpha_do_IRQ
        alpha: irq clean up
        alpha: use set_irq_chip and push down __do_IRQ to the machine types
      af575e2d
    • L
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 584ef2cd
      Linus Torvalds 提交于
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/radeon/kms: balance asic_reset functions
        drm/radeon/kms: remove duplicate card_posted() functions
        drm/radeon/kms: add module option for pcie gen2
        drm/radeon/kms: fix typo in evergreen safe reg
        drm/nouveau: fix gpu page faults triggered by plymouthd
        drm/nouveau: greatly simplify mm, killing some bugs in the process
        drm/nvc0: enable protection of system-use-only structures in vm
        drm/nv40: initialise 0x17xx on all chipsets that have it
        drm/nv40: make detection of 0x4097-ful chipsets available everywhere
      584ef2cd
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · e1288cd7
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (63 commits)
        ARM: PL08x: cleanup comments
        Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c
        ARM: PL08x: fix a warning
        Fix dmaengine_submit() return type
        dmaengine: at_hdmac: fix race while monitoring channel status
        dmaengine: at_hdmac: flags located in first descriptor
        dmaengine: at_hdmac: use subsys_initcall instead of module_init
        dmaengine: at_hdmac: no need set ACK in new descriptor
        dmaengine: at_hdmac: trivial add precision to unmapping comment
        dmaengine: at_hdmac: use dma_address to program DMA hardware
        pch_dma: support new device ML7213 IOH
        ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels
        ARM: PL08x: allow dma_set_runtime_config() to return errors
        ARM: PL08x: fix locking between prepare function and submit function
        ARM: PL08x: introduce 'phychan_hold' to hold on to physical channels
        ARM: PL08x: put txd's on the pending list in pl08x_tx_submit()
        ARM: PL08x: rename 'desc_list' as 'pend_list'
        ARM: PL08x: implement unmapping of memcpy buffers
        ARM: PL08x: store prep_* flags in async_tx structure
        ARM: PL08x: shrink srcbus/dstbus in txd structure
        ...
      e1288cd7
  2. 17 1月, 2011 36 次提交
  3. 16 1月, 2011 1 次提交