1. 11 8月, 2010 33 次提交
  2. 10 8月, 2010 7 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f6cec0ae
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (59 commits)
        igbvf.txt: Add igbvf Documentation
        igb.txt: Add igb documentation
        e100/e1000*/igb*/ixgb*: Add missing read memory barrier
        ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG
        netxen: protect tx timeout recovery by rtnl lock
        isdn: gigaset: use after free
        isdn: gigaset: add missing unlock
        solos-pci: Fix race condition in tasklet RX handling
        pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
        net: disable preemption before call smp_processor_id()
        tcp: no md5sig option size check bug
        iwlwifi: fix locking assertions
        iwlwifi: fix TX tracer
        isdn: fix information leak
        net: Fix napi_gro_frags vs netpoll path
        usbnet: remove noisy and hardly useful printk
        rtl8180: avoid potential NULL deref in rtl8180_beacon_work
        ath9k: Remove myself from the MAINTAINERS list
        libertas: scan before assocation if no BSSID was given
        libertas: fix association with some APs by using extended rates
        ...
      f6cec0ae
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · 0fcf12d5
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        tx493xide: use min_t() macro instead of min()
        drivers/ide: Use memdup_user
        via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support.
        ide-cd: Do not access completed requests in the irq handler
      0fcf12d5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 4d15393d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: Update defconfig.
        sparc: Kill user copy check code.
        sparc64: Fix perf_arch_get_caller_regs().
        sparc64: Add missing ID to parport probing code.
      4d15393d
    • L
      Merge branch 'rs485fix' of git://www.jni.nu/cris · 7fbd15f9
      Linus Torvalds 提交于
      * 'rs485fix' of git://www.jni.nu/cris:
        CRIS: ioctl for getting RS485 information
      7fbd15f9
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 1989425a
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: fix build with make 3.82
        Revert "Input: appletouch - fix integer overflow issue"
        memblock: Fix memblock_is_region_reserved() to return a boolean
        powerpc: Trim defconfigs
        powerpc: fix i8042 module build error
        sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
        powerpc/5200: add mpc5200_psc_ac97_gpio_reset
      1989425a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 0fc2f137
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (32 commits)
        Blackfin: gpio: add a debounce stub
        Blackfin: update defconfigs
        Blackfin: remove CONFIG_MEM_GENERIC_BOARD
        Blackfin: dpmc: punt unnecessary RTC_ISTAT clearing
        Blackfin: unify rotary encoder bitmasks
        Blackfin: unify SDH/RSI bitmasks
        Blackfin: BF54x: tweak DMAC MMR naming to match other ports
        Blackfin: TWI: clean up the MMR names
        Blackfin: add EVT_OVERRIDE/IPRIO core MMR helpers
        Blackfin: add support for dynamic ftrace
        Blackfin: add support for LZO compressed kernels
        Blackfin: portmux: fix peripheral map overflow when requesting pins
        Blackfin: document SPI CS limitations with CPHA=0
        Blackfin: remove useless and outdated documentation
        Blackfin: BF51x/BF52x: support GPIO Hysteresis/Schmitt Trigger options
        Blackfin: gpio/portmux: clean up whitespace corruption
        Blackfin: make sure mmiowb inserts a write barrier with SSYNC
        Blackfin: fix DMA/cache bug when resuming from suspend to RAM
        Blackfin: BF51x: fix handling of PH8 (the "internal" SPI0SEL4 pin)
        Blackfin: add a GPIO_DEFAULT_BOOT_SPI_CS
        ...
      0fc2f137
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · dcded10f
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (30 commits)
        DMAENGINE: at_hdmac: locking fixlet
        DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l
        dma: dmatest: fix potential sign bug
        ioat2: catch and recover from broken vtd configurations v6
        DMAENGINE: add runtime slave control to COH 901 318 v3
        DMAENGINE: add runtime slave config to DMA40 v3
        DMAENGINE: generic slave channel control v3
        dmaengine: Driver for Topcliff PCH DMA controller
        intel_mid: Add Mrst & Mfld DMA Drivers
        drivers/dma: Eliminate a NULL pointer dereference
        dma/timb_dma: compile warning on 32 bit
        DMAENGINE: ste_dma40: support older silicon
        DMAENGINE: ste_dma40: support disabling physical channels
        DMAENGINE: ste_dma40: no disabled phy channels on ux500
        DMAENGINE: ste_dma40: fix suspend bug
        DMAENGINE: ste_dma40: add DB8500 memcpy channels
        DMAENGINE: ste_dma40: no flow control on memcpy
        DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
        DMAENGINE: ste_dma40: allocate LCLA dynamically
        DMAENGINE: ste_dma40: no premature stop
        ...
      
      Fix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c
      dcded10f