1. 15 Dec, 2010 4 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · fc47e672
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: 6535/1: V6 MPCore v6_dma_inv_range and v6_dma_flush_range RWFO fix
        ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL
        ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6
        Change bcmring Maintainer list.
        ARM: Update mach-types
        ARM: 6528/1: Use CTR for the I-cache line size on ARMv7
        ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7
        ARM: pxa/palm: fix ifdef around gen_nand driver registration
        ARM: pxa: fix pxa2xx-flash section mismatch
        ARM: mmp2: remove not used clk_rtc
      fc47e672
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 478b2a34
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Write to prom console using indirect buffer.
        sparc: Delete prom_*getchar().
        sparc: Pass buffer pointer all the way down to prom_{get,put}char().
        sparc: Do not export prom_nb{get,put}char().
        sparc64: Delete prom_setcallback().
        sparc64: Unexport prom_service_exists().
        sparc: Kill prom devops_{32,64}.c
        sparc: Remove prom_pathtoinode()
        sparc64: Delete prom_puts() unused.
        SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ
      478b2a34
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · b4fe2a03
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (75 commits)
        pppoe.c: Fix kernel panic caused by __pppoe_xmit
        WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.
        bnx2x: Advance a version number to 1.60.01-0
        bnx2x: Fixed a compilation warning
        bnx2x: LSO code was broken on BE platforms
        qlge: Fix deadlock when cancelling worker.
        net: fix skb_defer_rx_timestamp()
        cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes
        phy: add the IC+ IP1001 driver
        atm: correct sysfs 'device' link creation and parent relationships
        MAINTAINERS: remove me from tulip
        SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
        enic: Bug Fix: Pass napi reference to the isr that services receive queue
        ipv6: fix nl group when advertising a new link
        connector: add module alias
        net: Document the kernel_recvmsg() function
        r8169: Fix runtime power management
        hso: IP checksuming doesn't work on GE0301 option cards
        xfrm: Fix xfrm_state_migrate leak
        net: Convert netpoll blocking api in bonding driver to be a counter
        ...
      b4fe2a03
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 85cb7f12
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
        [SCSI] qla2xxx: Update version number to 8.03.05-k0.
        [SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function.
        [SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
        [SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
        [SCSI] qla2xxx: Populate Command Type 6 LUN field properly.
        [SCSI] zfcp: Issue FCP command without holding SCSI host_lock
        [SCSI] zfcp: Prevent usage w/o holding a reference
        [SCSI] zfcp: No ERP escalation on gpn_ft eval
        [SCSI] zfcp: Correct false abort data assignment.
        [SCSI] zfcp: Fix common FCP request reception
        [SCSI] Eliminate error handler overload of the SCSI serial number
        [SCSI] pmcraid: disable msix and expand device config entry
        [SCSI] bsg: correct fault if queue object removed while dev_t open
        [SCSI] osd: checking NULL instead of ERR_PTR()
      85cb7f12
  2. 14 Dec, 2010 31 commits
  3. 13 Dec, 2010 3 commits
  4. 12 Dec, 2010 2 commits